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 /drivers/net/macvlan.c | |
| parent | 37fcbab61b8ecf75cb5fd81e5809b71c270f9632 (diff) | |
| download | linux-19bcf9f203c82c2028f5a0881b1f0690e3207190.tar.bz2 | |
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 'drivers/net/macvlan.c')
| -rw-r--r-- | drivers/net/macvlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 47da43595ac2..86f6c6292c27 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -412,7 +412,7 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb) port = macvlan_port_get_rcu(skb->dev); if (is_multicast_ether_addr(eth->h_dest)) { - skb = ip_check_defrag(skb, IP_DEFRAG_MACVLAN); + skb = ip_check_defrag(dev_net(skb->dev), skb, IP_DEFRAG_MACVLAN); if (!skb) return RX_HANDLER_CONSUMED; eth = eth_hdr(skb); |