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>

diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index fbc1094964bf57d86388646b0d19f1db923dcbb0..a351a003ee6b1e1c7b638f31b02564dea569217d 100644 (file)
--- 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) {

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index a3437a4cd07ecfdd28cbe47e0acd00e379ba9b19..f18f842ac8931a7702ebe0e250e3d595f5d187bb 100644 (file)
--- 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);