---

yaml --- r: 369209 b: refs/heads/master c: c031799 h: refs/heads/master i: 369207: 207abc4 v: v3
git-mirror · Apr 11, 2013 · fb55b3e · fb55b3e
1 parent b6a71d7
commit fb55b3e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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);