X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fnet%2Ftun.c;h=26f8635b027d3fb44ab12223000badc214098df0;hb=18f2af2d68815e1c4d5c275ebd030e27ef627582;hp=8fe9cb7d0f72e9fb7d34307f9a12797772844db1;hpb=b0d3f6d47e87e8ac8a47e0c7652ab536019477db;p=~andy%2Flinux

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 8fe9cb7d0f7..26f8635b027 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1686,7 +1686,9 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
 				   TUN_USER_FEATURES | NETIF_F_HW_VLAN_CTAG_TX |
 				   NETIF_F_HW_VLAN_STAG_TX;
 		dev->features = dev->hw_features;
-		dev->vlan_features = dev->features;
+		dev->vlan_features = dev->features &
+				     ~(NETIF_F_HW_VLAN_CTAG_TX |
+				       NETIF_F_HW_VLAN_STAG_TX);
 
 		INIT_LIST_HEAD(&tun->disabled);
 		err = tun_attach(tun, file, false);