diff --git a/[refs] b/[refs]
index dfc92fa7c713..01129650150f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f742aa8acb7e50a383f6d2b00b1c52e081970d38
+refs/heads/master: 6ee400aafb60289b78fcde5ebccd8c4973fc53f4
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 83507c265e48..4c58d11d3b68 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -2023,13 +2023,13 @@ int netif_skb_features(struct sk_buff *skb)
 		return harmonize_features(skb, protocol, features);
 	}
 
-	features &= skb->dev->vlan_features;
+	features &= (skb->dev->vlan_features | NETIF_F_HW_VLAN_TX);
 
 	if (protocol != htons(ETH_P_8021Q)) {
 		return harmonize_features(skb, protocol, features);
 	} else {
 		features &= NETIF_F_SG | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST |
-				NETIF_F_GEN_CSUM;
+				NETIF_F_GEN_CSUM | NETIF_F_HW_VLAN_TX;
 		return harmonize_features(skb, protocol, features);
 	}
 }