aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2013-08-13 11:51:10 -0400
committerDavid S. Miller <davem@davemloft.net>2013-08-15 04:00:20 -0400
commitfc8f999daa10a5c5c19562b88be96a9b2bacd9b7 (patch)
treeb6640ce1388663a305f597903dad9562079ffdb0 /net/ipv6
parent64261f230a9157f5f520ce30ec6827d679375e2f (diff)
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')
-rw-r--r--net/ipv6/sit.c6
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)
621 tstats->rx_packets++; 621 tstats->rx_packets++;
622 tstats->rx_bytes += skb->len; 622 tstats->rx_bytes += skb->len;
623 623
624 if (tunnel->net != dev_net(tunnel->dev)) 624 if (!net_eq(tunnel->net, dev_net(tunnel->dev)))
625 skb_scrub_packet(skb); 625 skb_scrub_packet(skb);
626 netif_rx(skb); 626 netif_rx(skb);
627 627
@@ -860,7 +860,7 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,
860 tunnel->err_count = 0; 860 tunnel->err_count = 0;
861 } 861 }
862 862
863 if (tunnel->net != dev_net(dev)) 863 if (!net_eq(tunnel->net, dev_net(dev)))
864 skb_scrub_packet(skb); 864 skb_scrub_packet(skb);
865 865
866 /* 866 /*
@@ -1589,7 +1589,7 @@ static void __net_exit sit_destroy_tunnels(struct sit_net *sitn, struct list_hea
1589 /* If dev is in the same netns, it has already 1589 /* If dev is in the same netns, it has already
1590 * been added to the list by the previous loop. 1590 * been added to the list by the previous loop.
1591 */ 1591 */
1592 if (dev_net(t->dev) != net) 1592 if (!net_eq(dev_net(t->dev), net))
1593 unregister_netdevice_queue(t->dev, 1593 unregister_netdevice_queue(t->dev,
1594 head); 1594 head);
1595 t = rtnl_dereference(t->next); 1595 t = rtnl_dereference(t->next);