diff options
| author | Vlad Yasevich <vyasevic@redhat.com> | 2014-03-24 17:52:12 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-26 15:55:10 -0400 |
| commit | 51dfe7b944998eaeb2b34d314f3a6b16a5fd621b (patch) | |
| tree | 395fd66c62e4689c3f27ac86f223f9363d039f97 /drivers/net/ethernet/broadcom/tg3.c | |
| parent | fbd02dd405d0724a0f25897ed4a6813297c9b96f (diff) | |
| download | kernel-common-51dfe7b944998eaeb2b34d314f3a6b16a5fd621b.tar.gz kernel-common-51dfe7b944998eaeb2b34d314f3a6b16a5fd621b.tar.bz2 kernel-common-51dfe7b944998eaeb2b34d314f3a6b16a5fd621b.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/broadcom/tg3.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 3b6d0ba86c71..70a225c8df5c 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -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; /* |