From 73faa056ff6b78ae4fd7719fa8b71364873b5eb7 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Tue, 20 Jan 2009 11:08:46 +0000
Subject: [PATCH] --- yaml --- r: 133884 b: refs/heads/master c:
 aec191aa2a04b082238156dc9690fff8ce95dd6b h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tun.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1ae2e340399e..af3e168b75b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c70f182940f988448f3c12a209d18b1edc276e33
+refs/heads/master: aec191aa2a04b082238156dc9690fff8ce95dd6b
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index 51dba6192bab..97b050015f5e 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -810,7 +810,6 @@ static void tun_setup(struct net_device *dev)
 
 	dev->ethtool_ops = &tun_ethtool_ops;
 	dev->destructor = free_netdev;
-	dev->features |= NETIF_F_NETNS_LOCAL;
 }
 
 static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)