---

yaml --- r: 224157 b: refs/heads/master c: 029f5fc h: refs/heads/master i: 224155: 31366ef v: v3
git-mirror · Nov 15, 2010 · d1b0812 · d1b0812
1 parent 0011754
commit d1b0812
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58e998c6d23988490162cef0784b19ea274d90bb
+refs/heads/master: 029f5fc31cdb35d6c8a7fe9a54bf21556e175988
diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c
@@ -334,6 +334,12 @@ static void vlan_transfer_features(struct net_device *dev,
 	vlandev->features &= ~dev->vlan_features;
 	vlandev->features |= dev->features & dev->vlan_features;
 	vlandev->gso_max_size = dev->gso_max_size;
+
+	if (dev->features & NETIF_F_HW_VLAN_TX)
+		vlandev->hard_header_len = dev->hard_header_len;
+	else
+		vlandev->hard_header_len = dev->hard_header_len + VLAN_HLEN;
+
 #if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
 	vlandev->fcoe_ddp_xid = dev->fcoe_ddp_xid;
 #endif