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 /include/net/netfilter | |
| parent | ipv4: Pass struct net into ip_defrag and ip_check_defrag (diff) | |
| download | linux-dev-b72775977c39dcd380777ff5ea8041fdf67ee382.tar.xz linux-dev-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 'include/net/netfilter')
| -rw-r--r-- | include/net/netfilter/ipv6/nf_defrag_ipv6.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netfilter/ipv6/nf_defrag_ipv6.h b/include/net/netfilter/ipv6/nf_defrag_ipv6.h index 27666d8a0bd0..fb7da5bb76cc 100644 --- a/include/net/netfilter/ipv6/nf_defrag_ipv6.h +++ b/include/net/netfilter/ipv6/nf_defrag_ipv6.h @@ -5,7 +5,7 @@ void nf_defrag_ipv6_enable(void); int nf_ct_frag6_init(void); void nf_ct_frag6_cleanup(void); -struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb, u32 user); +struct sk_buff *nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user); void nf_ct_frag6_consume_orig(struct sk_buff *skb); struct inet_frags_ctl; |