X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fethernet%2Fqlogic%2Fqlge%2Fqlge_main.c;h=ce2cfddbed504c1b960e32bc87691ff6965a1fce;hb=41804420586ab41049a14ab7ef04eaa2280b8647;hp=394c0a538e1cacb5b189c0a4d16e40cf5825a967;hpb=7b1e46c5a265b142dd05ff3463fa3e0a1f4e4172;p=deliverable%2Flinux.git

diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index 394c0a538e1c..ce2cfddbed50 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -4764,6 +4764,8 @@ static int qlge_probe(struct pci_dev *pdev,
 			    NETIF_F_RXCSUM;
 	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;
 
 	if (test_bit(QL_DMA64, &qdev->flags))
 		ndev->features |= NETIF_F_HIGHDMA;