---

yaml --- r: 231932 b: refs/heads/master c: 6ee400a h: refs/heads/master v: v3
git-mirror · Jan 19, 2011 · b20c4bf · b20c4bf
1 parent 4781aa4
commit b20c4bf
Show file tree

Hide file tree

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