vlan: Set hard_header_len according to available acceleration (fc0d48b8) · Commits · 戴 / test

Currently, if the card supports CTAG acceleration we do not account for the vlan header even if we are configuring an 8021AD vlan. This may not be best since we'll do software tagging for 8021AD which will cause data copy on skb head expansion Configure the length based on available hw offload capabilities and vlan protocol. CC: Patrick McHardy <kaber@trash.net> Signed-off-by:

Vlad Yasevich <vyasevic@redhat.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/8021q/vlan.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -307,9 +307,11 @@ static void vlan_sync_address(struct net_device *dev,
		static void vlan_transfer_features(struct net_device *dev,
		struct net_device *vlandev)
		{
		struct vlan_dev_priv *vlan = vlan_dev_priv(vlandev);

		vlandev->gso_max_size = dev->gso_max_size;

		if (dev->features & NETIF_F_HW_VLAN_CTAG_TX)
		if (vlan_hw_offload_capable(dev->features, vlan->vlan_proto))
		vlandev->hard_header_len = dev->hard_header_len;
		else
		vlandev->hard_header_len = dev->hard_header_len + VLAN_HLEN;

net/8021q/vlan_dev.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -592,7 +592,8 @@ static int vlan_dev_init(struct net_device *dev)
		#endif

		dev->needed_headroom = real_dev->needed_headroom;
		if (real_dev->features & NETIF_F_HW_VLAN_CTAG_TX) {
		if (vlan_hw_offload_capable(real_dev->features,
		vlan_dev_priv(dev)->vlan_proto)) {
		dev->header_ops = &vlan_passthru_header_ops;
		dev->hard_header_len = real_dev->hard_header_len;
		} else {

Admin message