aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000e/netdev.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/netdev.c')
-rw-r--r--drivers/net/ethernet/intel/e1000e/netdev.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index b18fad5b579e..a2e7db33bf9d 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -3373,7 +3373,7 @@ static void e1000e_set_rx_mode(struct net_device *netdev)
3373 3373
3374 ew32(RCTL, rctl); 3374 ew32(RCTL, rctl);
3375 3375
3376 if (netdev->features & NETIF_F_HW_VLAN_RX) 3376 if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX)
3377 e1000e_vlan_strip_enable(adapter); 3377 e1000e_vlan_strip_enable(adapter);
3378 else 3378 else
3379 e1000e_vlan_strip_disable(adapter); 3379 e1000e_vlan_strip_disable(adapter);
@@ -6418,7 +6418,7 @@ static int e1000_set_features(struct net_device *netdev,
6418 if (changed & (NETIF_F_TSO | NETIF_F_TSO6)) 6418 if (changed & (NETIF_F_TSO | NETIF_F_TSO6))
6419 adapter->flags |= FLAG_TSO_FORCE; 6419 adapter->flags |= FLAG_TSO_FORCE;
6420 6420
6421 if (!(changed & (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX | 6421 if (!(changed & (NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX |
6422 NETIF_F_RXCSUM | NETIF_F_RXHASH | NETIF_F_RXFCS | 6422 NETIF_F_RXCSUM | NETIF_F_RXHASH | NETIF_F_RXFCS |
6423 NETIF_F_RXALL))) 6423 NETIF_F_RXALL)))
6424 return 0; 6424 return 0;
@@ -6629,8 +6629,8 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
6629 6629
6630 /* Set initial default active device features */ 6630 /* Set initial default active device features */
6631 netdev->features = (NETIF_F_SG | 6631 netdev->features = (NETIF_F_SG |
6632 NETIF_F_HW_VLAN_RX | 6632 NETIF_F_HW_VLAN_CTAG_RX |
6633 NETIF_F_HW_VLAN_TX | 6633 NETIF_F_HW_VLAN_CTAG_TX |
6634 NETIF_F_TSO | 6634 NETIF_F_TSO |
6635 NETIF_F_TSO6 | 6635 NETIF_F_TSO6 |
6636 NETIF_F_RXHASH | 6636 NETIF_F_RXHASH |
@@ -6644,7 +6644,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
6644 netdev->hw_features |= NETIF_F_RXALL; 6644 netdev->hw_features |= NETIF_F_RXALL;
6645 6645
6646 if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER) 6646 if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER)
6647 netdev->features |= NETIF_F_HW_VLAN_FILTER; 6647 netdev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
6648 6648
6649 netdev->vlan_features |= (NETIF_F_SG | 6649 netdev->vlan_features |= (NETIF_F_SG |
6650 NETIF_F_TSO | 6650 NETIF_F_TSO |