1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index f27b549b692d..42a8bc8df5dd 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -3553,7 +3553,7 @@ bnx2_set_rx_mode(struct net_device *dev)
         rx_mode = bp->rx_mode & ~(BNX2_EMAC_RX_MODE_PROMISCUOUS |
                                   BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG);
         sort_mode = 1 | BNX2_RPM_SORT_USER0_BC_EN;
-        if (!(dev->features & NETIF_F_HW_VLAN_RX) &&
+        if (!(dev->features & NETIF_F_HW_VLAN_CTAG_RX) &&
              (bp->flags & BNX2_FLAG_CAN_KEEP_VLAN))
                 rx_mode |= BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG;
         if (dev->flags & IFF_PROMISC) {
@@ -7695,7 +7695,7 @@ bnx2_fix_features(struct net_device *dev, netdev_features_t features)
         struct bnx2 *bp = netdev_priv(dev);
 
         if (!(bp->flags & BNX2_FLAG_CAN_KEEP_VLAN))
-                features |= NETIF_F_HW_VLAN_RX;
+                features |= NETIF_F_HW_VLAN_CTAG_RX;
 
         return features;
 }
@@ -7706,12 +7706,12 @@ bnx2_set_features(struct net_device *dev, netdev_features_t features)
         struct bnx2 *bp = netdev_priv(dev);
 
         /* TSO with VLAN tag won't work with current firmware */
-        if (features & NETIF_F_HW_VLAN_TX)
+        if (features & NETIF_F_HW_VLAN_CTAG_TX)
                 dev->vlan_features |= (dev->hw_features & NETIF_F_ALL_TSO);
         else
                 dev->vlan_features &= ~NETIF_F_ALL_TSO;
 
-        if ((!!(features & NETIF_F_HW_VLAN_RX) !=
+        if ((!!(features & NETIF_F_HW_VLAN_CTAG_RX) !=
             !!(bp->rx_mode & BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG)) &&
             netif_running(dev)) {
                 bnx2_netif_stop(bp, false);
@@ -8551,7 +8551,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 dev->hw_features |= NETIF_F_IPV6_CSUM | NETIF_F_TSO6;
 
         dev->vlan_features = dev->hw_features;
-        dev->hw_features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+        dev->hw_features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
         dev->features |= dev->hw_features;
         dev->priv_flags |= IFF_UNICAST_FLT;