diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-10-09 13:44:54 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-12 19:44:16 -0700 |
| commit | 19bcf9f203c82c2028f5a0881b1f0690e3207190 (patch) | |
| tree | a3d9cbc354d0c464f8485b298f25bab4bae7a73b /net/netfilter | |
| parent | 37fcbab61b8ecf75cb5fd81e5809b71c270f9632 (diff) | |
| download | linux-stable-19bcf9f203c82c2028f5a0881b1f0690e3207190.tar.gz linux-stable-19bcf9f203c82c2028f5a0881b1f0690e3207190.tar.bz2 linux-stable-19bcf9f203c82c2028f5a0881b1f0690e3207190.zip | |
ipv4: Pass struct net into ip_defrag and ip_check_defrag
The function ip_defrag is called on both the input and the output
paths of the networking stack. In particular conntrack when it is
tracking outbound packets from the local machine calls ip_defrag.
So add a struct net parameter and stop making ip_defrag guess which
network namespace it needs to defragment packets in.
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/netfilter')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c index 37dd77a3d0fb..07a791ecdfba 100644 --- a/net/netfilter/ipvs/ip_vs_core.c +++ b/net/netfilter/ipvs/ip_vs_core.c @@ -694,7 +694,7 @@ static inline int ip_vs_gather_frags(struct netns_ipvs *ipvs, int err; local_bh_disable(); - err = ip_defrag(skb, user); + err = ip_defrag(ipvs->net, skb, user); local_bh_enable(); if (!err) ip_send_check(ip_hdr(skb)); |