diff options
| author |   Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2013-08-13 17:51:10 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-08-15 01:00:20 -0700 |
| commit | fc8f999daa10a5c5c19562b88be96a9b2bacd9b7 (patch) | |
| tree | b6640ce1388663a305f597903dad9562079ffdb0 /net/ipv4 | |
| parent | dev: move skb_scrub_packet() after eth_type_trans() (diff) | |
| download | linux-dev-fc8f999daa10a5c5c19562b88be96a9b2bacd9b7.tar.xz linux-dev-fc8f999daa10a5c5c19562b88be96a9b2bacd9b7.zip | |
ipv4 tunnels: use net_eq() helper to check netns
It's better to use available helpers for these tests.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ip_tunnel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index fbc1094964bf..a351a003ee6b 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -461,7 +461,7 @@ int ip_tunnel_rcv(struct ip_tunnel *tunnel, struct sk_buff *skb, skb->dev = tunnel->dev; } - if (tunnel->net != dev_net(tunnel->dev)) + if (!net_eq(tunnel->net, dev_net(tunnel->dev))) skb_scrub_packet(skb); gro_cells_receive(&tunnel->gro_cells, skb); @@ -614,7 +614,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, goto tx_error; } - if (tunnel->net != dev_net(dev)) + if (!net_eq(tunnel->net, dev_net(dev))) skb_scrub_packet(skb); if (tunnel->err_count > 0) { |