From d1b08128a632543cc034615f8a0222da7a5def9d Mon Sep 17 00:00:00 2001 From: John Fastabend Date: Sat, 30 Oct 2010 14:22:32 +0000 Subject: [PATCH] --- yaml --- r: 224157 b: refs/heads/master c: 029f5fc31cdb35d6c8a7fe9a54bf21556e175988 h: refs/heads/master i: 224155: 31366efe23916e29166ba7615ca0fd99f72c5e1d v: v3 --- [refs] | 2 +- trunk/net/8021q/vlan.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c003678c8c0a..5b841ae59352 100644 --- 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 index 52077ca22072..55d2135889fc 100644 --- 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