Skip to content

Commit

Permalink
ipv4 tunnels: use net_eq() helper to check netns
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nicolas Dichtel authored and David S. Miller committed Aug 15, 2013
1 parent 64261f2 commit fc8f999
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions net/ipv4/ip_tunnel.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions net/ipv6/sit.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);

/*
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit fc8f999

Please sign in to comment.