diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-10-09 13:44:55 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-12 19:44:17 -0700 |
| commit | b72775977c39dcd380777ff5ea8041fdf67ee382 (patch) | |
| tree | a1f5f6d66b9637f258fdd41ebc88f303d1af5ee0 /net/openvswitch | |
| parent | 19bcf9f203c82c2028f5a0881b1f0690e3207190 (diff) | |
| download | linux-b72775977c39dcd380777ff5ea8041fdf67ee382.tar.gz linux-b72775977c39dcd380777ff5ea8041fdf67ee382.tar.bz2 linux-b72775977c39dcd380777ff5ea8041fdf67ee382.zip | |
ipv6: Pass struct net into nf_ct_frag6_gather
The function nf_ct_frag6_gather is called on both the input and the
output paths of the networking stack. In particular ipv6_defrag which
calls nf_ct_frag6_gather is called from both the the PRE_ROUTING chain
on input and the LOCAL_OUT chain on output.
The addition of a net parameter makes it explicit which network
namespace the packets are being reassembled in, and removes the need
for nf_ct_frag6_gather to guess.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch')
| -rw-r--r-- | net/openvswitch/conntrack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index cb76076a7a42..ad614267cc2a 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c @@ -315,7 +315,7 @@ static int handle_fragments(struct net *net, struct sw_flow_key *key, struct sk_buff *reasm; memset(IP6CB(skb), 0, sizeof(struct inet6_skb_parm)); - reasm = nf_ct_frag6_gather(skb, user); + reasm = nf_ct_frag6_gather(net, skb, user); if (!reasm) return -EINPROGRESS; |