From fb55b3efeeac635a6c195eaed5134313dae8774a Mon Sep 17 00:00:00 2001
From: Jason Wang <jasowang@redhat.com>
Date: Wed, 10 Apr 2013 23:32:22 +0000
Subject: [PATCH] --- yaml --- r: 369209 b: refs/heads/master c:
 c0317998c340203204ee7622d75a59f41ac13bc6 h: refs/heads/master i:   369207:
 207abc420d064d8eb3b4465b53cef828708bda0f v: v3

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

diff --git a/[refs] b/[refs]
index 32c002e17f63..928439191b5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fda830263c52a58bcbaedeb091cbcd421cf4858
+refs/heads/master: c0317998c340203204ee7622d75a59f41ac13bc6
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index 29538e6e914d..316c759bd988 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -1656,6 +1656,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
 		dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST |
 			TUN_USER_FEATURES;
 		dev->features = dev->hw_features;
+		dev->vlan_features = dev->features;
 
 		INIT_LIST_HEAD(&tun->disabled);
 		err = tun_attach(tun, file);