---

yaml --- r: 90777 b: refs/heads/master c: 7a97146 h: refs/heads/master i: 90775: ce09616 v: v3
git-mirror · Apr 16, 2008 · 369adae · 369adae
1 parent 1951d1b
commit 369adae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 907a08c4023b54ffebf3fb966efcbcc1312abe32
+refs/heads/master: 7a97146cc6e8145f65abfee36e56de7b8061c34f
diff --git a/trunk/net/ipv6/sit.c b/trunk/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)