diff options
| author | Andrew Rybchenko <Andrew.Rybchenko@oktetlabs.ru> | 2016-06-15 17:51:36 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-15 22:26:27 -0700 |
| commit | eb7cfd8c9b6e28edf339b89bf19322c11514d286 (patch) | |
| tree | 91a41c5b1784f409a6538221956b064aa24fdbf2 /drivers/net/ethernet/sfc | |
| parent | e4478ad14f442103d7f03406933aeb28cbdfc1bd (diff) | |
sfc: Disable VLAN filtering by default if not strictly required
If should be done after net_dev->hw_features initialization, to keep the
feature there to be able to enable it later using ethtool.
VLAN filtering is enforced and fixed if vPort requires usage of VLAN
filters to receive tagged traffic.
Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sfc')
| -rw-r--r-- | drivers/net/ethernet/sfc/efx.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index 130ee176cd4f..14b821b1c880 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c @@ -3202,8 +3202,16 @@ static int efx_pci_probe(struct pci_dev *pci_dev, net_dev->vlan_features |= (NETIF_F_HW_CSUM | NETIF_F_SG | NETIF_F_HIGHDMA | NETIF_F_ALL_TSO | NETIF_F_RXCSUM); - net_dev->features |= efx->fixed_features; + net_dev->hw_features = net_dev->features & ~efx->fixed_features; + + /* Disable VLAN filtering by default. It may be enforced if + * the feature is fixed (i.e. VLAN filters are required to + * receive VLAN tagged packets due to vPort restrictions). + */ + net_dev->features &= ~NETIF_F_HW_VLAN_CTAG_FILTER; + net_dev->features |= efx->fixed_features; + pci_set_drvdata(pci_dev, efx); SET_NETDEV_DEV(net_dev, &pci_dev->dev); rc = efx_init_struct(efx, pci_dev, net_dev); |