diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2008-04-16 01:17:18 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-16 01:17:18 -0700 |
| commit | 7a97146cc6e8145f65abfee36e56de7b8061c34f (patch) | |
| tree | 08a2f8e5ecaf0368cd6db2ec908974d48a45acbd /net | |
| parent | 907a08c4023b54ffebf3fb966efcbcc1312abe32 (diff) | |
| download | op-kernel-dev-7a97146cc6e8145f65abfee36e56de7b8061c34f.zip op-kernel-dev-7a97146cc6e8145f65abfee36e56de7b8061c34f.tar.gz | |
[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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/sit.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 7badac6..4b2f103 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) |
