| From foo@baz Thu Apr 10 22:03:04 PDT 2014 |
| From: Vlad Yasevich <vyasevic@redhat.com> |
| Date: Mon, 24 Mar 2014 17:52:12 -0400 |
| Subject: tg3: Do not include vlan acceleration features in vlan_features |
| |
| From: Vlad Yasevich <vyasevic@redhat.com> |
| |
| [ Upstream commit 51dfe7b944998eaeb2b34d314f3a6b16a5fd621b ] |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/broadcom/tg3.c | 5 ++--- |
| 1 file changed, 2 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/net/ethernet/broadcom/tg3.c |
| +++ b/drivers/net/ethernet/broadcom/tg3.c |
| @@ -17485,8 +17485,6 @@ static int tg3_init_one(struct pci_dev * |
| |
| 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. |
| */ |
| @@ -17518,7 +17516,8 @@ static int tg3_init_one(struct pci_dev * |
| 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; |
| |
| /* |
