Skip to content

Commit

Permalink
[IPIP]: Allow to create IPIP tunnels in net namespaces.
Browse files Browse the repository at this point in the history
Set the proper net before calling register_netdev and disable 
the tunnel device netns changing.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Pavel Emelyanov authored and David S. Miller committed Apr 16, 2008
1 parent b99f015 commit 0a82640
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions net/ipv4/ipip.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 0a82640

Please sign in to comment.