Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc8f999d authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

ipv4 tunnels: use net_eq() helper to check netns 



It's better to use available helpers for these tests.

Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 64261f23

net/ipv4/ip_tunnel.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {

net/ipv6/sit.c

+3 −3
Original line number Diff line number Diff line
@@ -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);