From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Fri, 21 Feb 2014 07:41:11 +0000 (+0100)
Subject: vti4: Enable namespace changing
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=895de9a3488abcdd186680f0af3cce7f2d4d4a6e;p=linux-beck.git

vti4: Enable namespace changing

vti4 is now fully namespace aware, so allow namespace changing
for vti devices

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---

diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index 9471893df47c..687ddef4e574 100644
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@ -354,7 +354,6 @@ static int vti_tunnel_init(struct net_device *dev)
 	dev->flags		= IFF_NOARP;
 	dev->iflink		= 0;
 	dev->addr_len		= 4;
-	dev->features		|= NETIF_F_NETNS_LOCAL;
 	dev->features		|= NETIF_F_LLTX;
 	dev->priv_flags		&= ~IFF_XMIT_DST_RELEASE;