diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2016-08-12 09:53:39 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-30 10:12:48 +0200 |
| commit | 03c35e10e68d3dafd2a8189a37b20c21695d1e74 (patch) | |
| tree | c03c1a200bb5ded956f6d365f35c64a03c72e7ec | |
| parent | b4cc7dd0636a4bdf2987474dd7063044c262faab (diff) | |
| download | linux-stable-03c35e10e68d3dafd2a8189a37b20c21695d1e74.tar.gz linux-stable-03c35e10e68d3dafd2a8189a37b20c21695d1e74.tar.bz2 linux-stable-03c35e10e68d3dafd2a8189a37b20c21695d1e74.zip | |
ixgbe: Re-enable ability to toggle VLAN filtering
commit 3d951822be216d8c6fcfc8abf75e5ed307eeb646 upstream.
Back when I submitted the GSO code I messed up and dropped the support for
disabling the VLAN tag filtering via the feature bit. This patch
re-enables the use of the NETIF_F_HW_VLAN_CTAG_FILTER to enable/disable the
VLAN filtering independent of toggling promiscuous mode.
Fixes: b83e30104b ("ixgbe/ixgbevf: Add support for GSO partial")
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 7228632ccb1b..58153e818e81 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -9502,6 +9502,7 @@ skip_sriov: /* copy netdev features into list of user selectable features */ netdev->hw_features |= netdev->features | + NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_RXALL | |