]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ixgbe: Remove NETIF_F_HW_VLAN_CTAG_FILTER from hw_features
authorAlexander Duyck <alexander.h.duyck@redhat.com>
Fri, 10 Apr 2015 05:03:24 +0000 (22:03 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Fri, 10 Apr 2015 07:23:22 +0000 (00:23 -0700)
This change makes it so that the HW_VLAN_CTAG_FILTER bit is not falsely
advertised as being a feature that can be toggled on ixgbe parts.  The
driver was setting the bit in features and letting it be inherited by
hw_features, however the driver was actually ignoring the value of the bit
and just assuming it was always set.  As a result VLAN filtering was always
enabled which is a requirement for SR-IOV, VMDq, DCB, FCoE, and possibly
other features within the adapters.

Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

index c696ad721153a633071a660669f779effa6a8621..0b38be8a1a528ac5c79f3bb65ca1f4d0712ff1f5 100644 (file)
@@ -8455,7 +8455,6 @@ skip_sriov:
                           NETIF_F_IPV6_CSUM |
                           NETIF_F_HW_VLAN_CTAG_TX |
                           NETIF_F_HW_VLAN_CTAG_RX |
-                          NETIF_F_HW_VLAN_CTAG_FILTER |
                           NETIF_F_TSO |
                           NETIF_F_TSO6 |
                           NETIF_F_RXHASH |
@@ -8477,6 +8476,7 @@ skip_sriov:
        }
 
        netdev->hw_features |= NETIF_F_RXALL;
+       netdev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
 
        netdev->vlan_features |= NETIF_F_TSO;
        netdev->vlan_features |= NETIF_F_TSO6;