compat: ipv6: Pass struct net into nf_ct_frag6_gather.
authorJoe Stringer <joe@ovn.org>
Mon, 2 May 2016 18:19:12 +0000 (11:19 -0700)
committerJoe Stringer <joe@ovn.org>
Tue, 3 May 2016 00:06:36 +0000 (17:06 -0700)
commit01f35e09e07c9413596ce8055a891106bd3e2c6e
treedfdd85b9298eb50e646ddfbd969204f43daccf49
parent39c0ff22171091ab7eeb021070ba7a751ac10637
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>
datapath/conntrack.c
datapath/linux/compat/include/net/netfilter/ipv6/nf_defrag_ipv6.h
datapath/linux/compat/nf_conntrack_reasm.c