8021q: set hard_header_len when VLAN offload features are toggled
authorJohn Fastabend <john.r.fastabend@intel.com>
Sat, 30 Oct 2010 14:22:32 +0000 (14:22 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 15 Nov 2010 18:11:39 +0000 (10:11 -0800)
Toggling the vlan tx|rx hw offloads needs to set the hard_header_len
as well otherwise we end up using LL_RESERVED_SPACE incorrectly.
This results in pskb_expand_head() being used unnecessarily.

Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/8021q/vlan.c

index 52077ca22072d6eeab3e12db0030fb5f3c2db68c..55d2135889fc57616191e9322da005a9149a07e4 100644 (file)
@@ -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