Star64_linux/net
Jarno Rajahalme 09aa98ad49 openvswitch: Inherit master's labels.
We avoid calling into nf_conntrack_in() for expected connections, as
that would remove the expectation that we want to stick around until
we are ready to commit the connection.  Instead, we do a lookup in the
expectation table directly.  However, after a successful expectation
lookup we have set the flow key label field from the master
connection, whereas nf_conntrack_in() does not do this.  This leads to
master's labels being inherited after an expectation lookup, but those
labels not being inherited after the corresponding conntrack action
with a commit flag.

This patch resolves the problem by changing the commit code path to
also inherit the master's labels to the expected connection.
Resolving this conflict in favor of inheriting the labels allows more
information be passed from the master connection to related
connections, which would otherwise be much harder if the 32 bits in
the connmark are not enough.  Labels can still be set explicitly, so
this change only affects the default values of the labels in presense
of a master connection.

Fixes: 7f8a436eaa ("openvswitch: Add conntrack action")
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Acked-by: Joe Stringer <joe@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-02-09 22:59:34 -05:00
..
6lowpan
9p
802
8021q net: remove ndo_neigh_{construct, destroy} from stacked devices 2017-02-06 11:25:57 -05:00
appletalk
atm
ax25
batman-adv Here are two fixes for batman-adv for net-next: 2017-01-29 19:21:26 -05:00
bluetooth
bridge bridge: vlan tunnel id info range fill size calc cleanups 2017-02-08 14:39:19 -05:00
caif
can can: bcm: fix hrtimer/tasklet termination in bcm op removal 2017-01-30 11:05:04 +01:00
ceph
core gro_cells: move to net/core/gro_cells.c 2017-02-08 14:38:18 -05:00
dcb
dccp
decnet
dns_resolver
dsa net: dsa: Fix duplicate object rule 2017-02-09 17:11:09 -05:00
ethernet net: add devm version of alloc_etherdev_mqs function 2017-01-29 19:24:12 -05:00
hsr net-next: treewide use is_vlan_dev() helper function. 2017-02-06 16:33:29 -05:00
ieee802154
ife net: Introduce ife encapsulation module 2017-02-03 15:16:45 -05:00
ipv4 ipv4: fib: Notify about nexthop status changes 2017-02-08 15:25:18 -05:00
ipv6 gro_cells: move to net/core/gro_cells.c 2017-02-08 14:38:18 -05:00
ipx
irda
iucv
kcm
key
l2tp net: use dst_confirm_neigh for UDP, RAW, ICMP, L2TP 2017-02-07 13:07:47 -05:00
l3mdev
lapb
llc
mac80211 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-02-07 16:29:30 -05:00
mac802154
mpls lwtunnel: remove device arg to lwtunnel_build_state 2017-01-30 15:14:22 -05:00
ncsi
netfilter Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next 2017-02-03 16:58:20 -05:00
netlabel
netlink
netrom
nfc
openvswitch openvswitch: Inherit master's labels. 2017-02-09 22:59:34 -05:00
packet
phonet
psample
qrtr
rds
rfkill
rose
rxrpc
sched net/sched: act_mirred: remove duplicated include from act_mirred.c 2017-02-07 11:42:34 -05:00
sctp sctp: implement sender-side procedures for Add Incoming/Outgoing Streams Request Parameter 2017-02-09 16:57:38 -05:00
smc smc: some potential use after free bugs 2017-01-30 16:37:55 -05:00
strparser
sunrpc svcrpc: fix oops in absence of krb5 module 2017-01-31 12:29:24 -05:00
switchdev
tipc
unix unix: add ioctl to open a unix socket file with O_PATH 2017-02-02 21:58:02 -05:00
vmw_vsock
wimax
wireless Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-02-07 16:29:30 -05:00
x25
xfrm gro_cells: move to net/core/gro_cells.c 2017-02-08 14:38:18 -05:00
compat.c
Kconfig gro_cells: move to net/core/gro_cells.c 2017-02-08 14:38:18 -05:00
Makefile net: Introduce ife encapsulation module 2017-02-03 15:16:45 -05:00
socket.c
sysctl_net.c