From 369adae480a9e247b24a58ea1ec4b93d5b685d42 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Wed, 16 Apr 2008 01:17:18 -0700 Subject: [PATCH] --- yaml --- r: 90777 b: refs/heads/master c: 7a97146cc6e8145f65abfee36e56de7b8061c34f h: refs/heads/master i: 90775: ce09616cf13ad9a02b181ddba69b74b302eb1fb7 v: v3 --- [refs] | 2 +- trunk/net/ipv6/sit.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 319bdc986159..ae825a19bfc5 100644 --- 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 index 7badac6c7416..4b2f1033994e 100644 --- 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)