Commit 51dfe7b9 authored Mar 24, 2014 by Vlad Yasevich Committed by David S. Miller Mar 26, 2014

tg3: Do not include vlan acceleration features in vlan_features



Including hardware acceleration features in vlan_features breaks
stacked vlans (Q-in-Q) by marking the bottom vlan interface as
capable of acceleration.  This causes one of the tags to be lost
and the packets are sent with a sing vlan header.

CC: Nithin Nayak Sujir <nsujir@broadcom.com>
CC: Michael Chan <mchan@broadcom.com>
Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent fbd02dd4

drivers/net/ethernet/broadcom/tg3.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -17649,8 +17649,6 @@ static int tg3_init_one(struct pci_dev *pdev,

		tg3_init_bufmgr_config(tp);

		features \|= NETIF_F_HW_VLAN_CTAG_TX \| NETIF_F_HW_VLAN_CTAG_RX;

		/* 5700 B0 chips do not support checksumming correctly due
		* to hardware bugs.
		*/
		@@ -17682,7 +17680,8 @@ static int tg3_init_one(struct pci_dev *pdev,
		features \|= NETIF_F_TSO_ECN;
		}

		dev->features \|= features;
		dev->features \|= features \| NETIF_F_HW_VLAN_CTAG_TX \|
		NETIF_F_HW_VLAN_CTAG_RX;
		dev->vlan_features \|= features;

		/*