ipv6: Pass struct net into nf_ct_frag6_gather
authorEric W. Biederman <ebiederm@xmission.com>
Fri, 9 Oct 2015 18:44:55 +0000 (13:44 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Oct 2015 02:44:17 +0000 (19:44 -0700)
commitb72775977c39dcd380777ff5ea8041fdf67ee382
treea1f5f6d66b9637f258fdd41ebc88f303d1af5ee0
parent19bcf9f203c82c2028f5a0881b1f0690e3207190
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>
include/net/netfilter/ipv6/nf_defrag_ipv6.h
net/ipv6/netfilter/nf_conntrack_reasm.c
net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
net/openvswitch/conntrack.c