diff options
| author | Joe Stringer <joe@ovn.org> | 2016-05-02 11:19:12 -0700 |
|---|---|---|
| committer | Joe Stringer <joe@ovn.org> | 2016-05-02 17:06:36 -0700 |
| commit | 01f35e09e07c9413596ce8055a891106bd3e2c6e (patch) | |
| tree | dfdd85b9298eb50e646ddfbd969204f43daccf49 /datapath/conntrack.c | |
| parent | 39c0ff22171091ab7eeb021070ba7a751ac10637 (diff) | |
| download | openvswitch-01f35e09e07c9413596ce8055a891106bd3e2c6e.tar.gz | |
compat: ipv6: Pass struct net into nf_ct_frag6_gather.
Upstream commit:
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>
Upstream: b72775977c39 ("ipv6: Pass struct net into nf_ct_frag6_gather")
Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Jesse Gross <jesse@kernel.org>
Diffstat (limited to 'datapath/conntrack.c')
| -rw-r--r-- | datapath/conntrack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/datapath/conntrack.c b/datapath/conntrack.c index 548a05fc2..6cf97942c 100644 --- a/datapath/conntrack.c +++ b/datapath/conntrack.c @@ -333,7 +333,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; |