Commit 7a97146c authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[SIT]: Allow to create SIT tunnels in net namespaces. 



Set proper net and mark a new device as NETNS_LOCAL before registering.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 907a08c4

net/ipv6/sit.c

+3 −0
Original line number Diff line number Diff line
@@ -182,6 +182,8 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct net *net, 
	if (dev == NULL)

		return NULL;



	dev_net_set(dev, net);



	if (strchr(name, '%')) {

		if (dev_alloc_name(dev, name) < 0)

			goto failed_free;
@@ -1029,6 +1031,7 @@ static void ipip6_tunnel_setup(struct net_device *dev) 
	dev->flags		= IFF_NOARP;

	dev->iflink		= 0;

	dev->addr_len		= 4;

	dev->features		|= NETIF_F_NETNS_LOCAL;

}



static int ipip6_tunnel_init(struct net_device *dev)