Joe Stringer
182e3042e1
openvswitch: Allow matching on conntrack mark ...
Allow matching and setting the ct_mark field. As with ct_state and
ct_zone, these fields are populated when the CT action is executed. To
write to this field, a value and mask can be specified as a nested
attribute under the CT action. This data is stored with the conntrack
entry, and is executed after the lookup occurs for the CT action. The
conntrack entry itself must be committed using the COMMIT flag in the CT
action flags for this change to persist.
Signed-off-by: Justin Pettit <jpettit@nicira.com>
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-08-27 11:40:43 -07:00
6lowpan: move module_init into core functionality
2015-08-11 22:05:36 +02:00
virtio/vhost: fixes for 4.2
2015-07-23 13:07:04 -07:00
net: 8021q: convert to using IFF_NO_QUEUE
2015-08-18 11:55:06 -07:00
br2684: Remove unnecessary formatting macros b1 and bs
2015-07-31 15:25:52 -07:00
NET: AX.25: Stop heartbeat timer on disconnect.
2015-07-15 15:59:58 -07:00
batman-adv: beautify supported routing algorithm list
2015-08-25 00:12:24 +02:00
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
2015-08-17 15:41:21 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-08-21 11:44:04 -07:00
net: caif: convert to using IFF_NO_QUEUE
2015-08-18 11:55:07 -07:00
can: replace timestamp as unique skb attribute
2015-07-12 21:13:22 +02:00
libceph: treat sockaddr_storage with uninitialized family as blank
2015-07-09 20:30:34 +03:00
bpf: fix bpf_skb_set_tunnel_key() helper
2015-08-26 17:38:13 -07:00
tcp: fix recv with flags MSG_WAITALL | MSG_PEEK
2015-07-27 01:06:53 -07:00
net: dsa: Allow multi hop routes to be expressed
2015-08-18 14:17:21 -07:00
net: ethernet: Fix double word "the the" in eth.c
2015-08-09 22:53:00 -07:00
net: hsr: convert to using IFF_NO_QUEUE
2015-08-18 11:55:07 -07:00
net: 6lowpan: convert to using IFF_NO_QUEUE
2015-08-18 11:55:06 -07:00
ah4: Fix error return in ah_input().
2015-08-25 13:38:50 -07:00
ipv6: Export nf_ct_frag6_gather()
2015-08-27 11:40:42 -07:00
tcp: fix recv with flags MSG_WAITALL | MSG_PEEK
2015-07-27 01:06:53 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-08-21 11:44:04 -07:00
ieee802154: add ack request default handling
2015-08-10 20:43:06 +02:00
lwt: Add cfg argument to build_state
2015-08-24 10:34:40 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-08-21 06:09:05 +02:00
netlink: make sure -EBUSY won't escape from netlink_insert
2015-08-10 10:59:10 -07:00
nfc: netlink: Add capability to reply to vendor_cmd with data
2015-08-20 22:00:11 +02:00
openvswitch: Allow matching on conntrack mark
2015-08-27 11:40:43 -07:00
packet: add extended BPF fanout mode
2015-08-17 14:22:48 -07:00
RDS: remove superfluous from rds_ib_alloc_fmr()
2015-08-25 16:28:11 -07:00
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
2015-08-17 15:41:21 -07:00
net_sched: act_bpf: remove spinlock in fast path
2015-08-26 11:01:45 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-07-31 23:52:20 -07:00
NFS client bugfixes for Linux 4.2
2015-07-28 09:37:44 -07:00
net: switchdev: support static FDB addresses
2015-08-11 12:03:19 -07:00
tipc: fix stale link problem during synchronization
2015-08-23 16:14:45 -07:00
net:wimax: Fix doucble word "the the" in networking.xml
2015-08-09 22:43:52 -07:00
nl80211: Allow setting multicast rate on OCB interfaces
2015-08-14 17:49:48 +02:00
xfrm: Add oif to dst lookups
2015-08-11 12:41:35 +02:00
lwtunnel: infrastructure for handling light weight tunnels like mpls
2015-07-21 10:39:03 -07:00
182e3042e1