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/ipv6/sit.c | |
| parent | 64261f230a9157f5f520ce30ec6827d679375e2f (diff) | |
| download | linux-fc8f999daa10a5c5c19562b88be96a9b2bacd9b7.tar.gz linux-fc8f999daa10a5c5c19562b88be96a9b2bacd9b7.tar.bz2 linux-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/ipv6/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index a3437a4cd07e..f18f842ac893 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -621,7 +621,7 @@ static int ipip6_rcv(struct sk_buff *skb) tstats->rx_packets++; tstats->rx_bytes += skb->len; - if (tunnel->net != dev_net(tunnel->dev)) + if (!net_eq(tunnel->net, dev_net(tunnel->dev))) skb_scrub_packet(skb); netif_rx(skb); @@ -860,7 +860,7 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb, tunnel->err_count = 0; } - if (tunnel->net != dev_net(dev)) + if (!net_eq(tunnel->net, dev_net(dev))) skb_scrub_packet(skb); /* @@ -1589,7 +1589,7 @@ static void __net_exit sit_destroy_tunnels(struct sit_net *sitn, struct list_hea /* If dev is in the same netns, it has already * been added to the list by the previous loop. */ - if (dev_net(t->dev) != net) + if (!net_eq(dev_net(t->dev), net)) unregister_netdevice_queue(t->dev, head); t = rtnl_dereference(t->next); |