From: Pavel Emelyanov <xemul@openvz.org>
Date: Wed, 16 Apr 2008 08:17:18 +0000 (-0700)
Subject: [SIT]: Allow to create SIT tunnels in net namespaces.
X-Git-Tag: v2.6.26-rc1~1138^2~31
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7a97146cc6e8145f65abfee36e56de7b8061c34f;p=linux-2.6-omap-h63xx.git

[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: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 7badac6c741..4b2f1033994 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -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)