diff --git a/[refs] b/[refs]
index a6006c7a6dbf..f2f44e8abb4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b99f0152e5f96dde31d2b9060b4f1029abc11078
+refs/heads/master: 0a826406d4adf0c4b7cd47f116cb8e8ef65b92a3
diff --git a/trunk/net/ipv4/ipip.c b/trunk/net/ipv4/ipip.c
index 1de39e1dc432..149111f08e8d 100644
--- a/trunk/net/ipv4/ipip.c
+++ b/trunk/net/ipv4/ipip.c
@@ -239,6 +239,8 @@ static struct ip_tunnel * ipip_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;
@@ -839,6 +841,7 @@ static void ipip_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 ipip_tunnel_init(struct net_device *dev)