Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 554eb277 authored Apr 16, 2008 by Pavel Emelyanov Committed by David S. Miller Apr 16, 2008

[IP6TUNNEL]: Allow to create IP6 tunnels in net namespaces.



And no need in some IPPROTO_XXX enabling, since ipv6 code
doesn't have any filtering.

So, just set proper net and mark device with NETNS_LOCAL.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 2f7f54b7

net/ipv6/ip6_tunnel.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -243,6 +243,8 @@ static struct ip6_tnl ip6_tnl_create(struct net net, struct ip6_tnl_parm *p)
	if (dev == NULL)		if (dev == NULL)
	goto failed;		goto failed;

			dev_net_set(dev, net);

	if (strchr(name, '%')) {		if (strchr(name, '%')) {
	if (dev_alloc_name(dev, name) < 0)		if (dev_alloc_name(dev, name) < 0)
	goto failed_free;		goto failed_free;
	@@ -1341,6 +1343,7 @@ static void ip6_tnl_dev_setup(struct net_device *dev)
	dev->mtu = ETH_DATA_LEN - sizeof (struct ipv6hdr);		dev->mtu = ETH_DATA_LEN - sizeof (struct ipv6hdr);
	dev->flags \|= IFF_NOARP;		dev->flags \|= IFF_NOARP;
	dev->addr_len = sizeof(struct in6_addr);		dev->addr_len = sizeof(struct in6_addr);
			dev->features \|= NETIF_F_NETNS_LOCAL;
	}		}