diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-10-09 21:44:54 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-13 05:44:16 +0300 |
| commit | 19bcf9f203c82c2028f5a0881b1f0690e3207190 (patch) | |
| tree | a3d9cbc354d0c464f8485b298f25bab4bae7a73b /net/openvswitch | |
| parent | 37fcbab61b8ecf75cb5fd81e5809b71c270f9632 (diff) | |
| download | linux-19bcf9f203c82c2028f5a0881b1f0690e3207190.tar.xz | |
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/openvswitch')
| -rw-r--r-- | net/openvswitch/conntrack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index eb759e3a88ca..cb76076a7a42 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c @@ -304,7 +304,7 @@ static int handle_fragments(struct net *net, struct sw_flow_key *key, int err; memset(IPCB(skb), 0, sizeof(struct inet_skb_parm)); - err = ip_defrag(skb, user); + err = ip_defrag(net, skb, user); if (err) return err; |