Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6d1ac4b authored by Vlad Yasevich's avatar Vlad Yasevich Committed by David S. Miller
Browse files

qlge: Do not propaged vlan tag offloads to vlans 



qlge driver turns off NETIF_F_HW_CTAG_FILTER, but forgets to
turn off HW_CTAG_TX and HW_CTAG_RX on vlan devices.  With the
current settings, q-in-q will only generate a single vlan header.
Remember to mask off CTAG_TX and CTAG_RX features in vlan_features.

CC: Shahed Shaikh <shahed.shaikh@qlogic.com>
CC: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
CC: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: default avatarVlad Yasevich <vyasevic@redhat.com>
Acked-by: default avatarJitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fc92f745

drivers/net/ethernet/qlogic/qlge/qlge_main.c

+3 −1
Original line number Diff line number Diff line
@@ -4765,7 +4765,9 @@ static int qlge_probe(struct pci_dev *pdev, 
	ndev->features = ndev->hw_features;

	ndev->vlan_features = ndev->hw_features;

	/* vlan gets same features (except vlan filter) */

	ndev->vlan_features &= ~NETIF_F_HW_VLAN_CTAG_FILTER;

	ndev->vlan_features &= ~(NETIF_F_HW_VLAN_CTAG_FILTER |

				 NETIF_F_HW_VLAN_CTAG_TX |

				 NETIF_F_HW_VLAN_CTAG_RX);



	if (test_bit(QL_DMA64, &qdev->flags))

		ndev->features |= NETIF_F_HIGHDMA;