8 files changed, 42 insertions, 42 deletions

diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index d98e1d0996d4..8d0d0d420c21 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -809,10 +809,10 @@ static netdev_features_t e1000_fix_features(struct net_device *netdev,
         /* Since there is no support for separate Rx/Tx vlan accel
          * enable/disable make sure Tx flag is always in same state as Rx.
          */
-        if (features & NETIF_F_HW_VLAN_RX)
-                features |= NETIF_F_HW_VLAN_TX;
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
+                features |= NETIF_F_HW_VLAN_CTAG_TX;
         else
-                features &= ~NETIF_F_HW_VLAN_TX;
+                features &= ~NETIF_F_HW_VLAN_CTAG_TX;
 
         return features;
 }
@@ -823,7 +823,7 @@ static int e1000_set_features(struct net_device *netdev,
         struct e1000_adapter *adapter = netdev_priv(netdev);
         netdev_features_t changed = features ^ netdev->features;
 
-        if (changed & NETIF_F_HW_VLAN_RX)
+        if (changed & NETIF_F_HW_VLAN_CTAG_RX)
                 e1000_vlan_mode(netdev, features);
 
         if (!(changed & (NETIF_F_RXCSUM | NETIF_F_RXALL)))
@@ -1058,9 +1058,9 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (hw->mac_type >= e1000_82543) {
                 netdev->hw_features = NETIF_F_SG |
                                    NETIF_F_HW_CSUM |
-                                   NETIF_F_HW_VLAN_RX;
-                netdev->features = NETIF_F_HW_VLAN_TX |
-                                   NETIF_F_HW_VLAN_FILTER;
+                                   NETIF_F_HW_VLAN_CTAG_RX;
+                netdev->features = NETIF_F_HW_VLAN_CTAG_TX |
+                                   NETIF_F_HW_VLAN_CTAG_FILTER;
         }
 
         if ((hw->mac_type >= e1000_82544) &&
@@ -4785,7 +4785,7 @@ static void __e1000_vlan_mode(struct e1000_adapter *adapter,
         u32 ctrl;
 
         ctrl = er32(CTRL);
-        if (features & NETIF_F_HW_VLAN_RX) {
+        if (features & NETIF_F_HW_VLAN_CTAG_RX) {
                 /* enable VLAN tag insert/strip */
                 ctrl |= E1000_CTRL_VME;
         } else {
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)
 
         ew32(RCTL, rctl);
 
-        if (netdev->features & NETIF_F_HW_VLAN_RX)
+        if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX)
                 e1000e_vlan_strip_enable(adapter);
         else
                 e1000e_vlan_strip_disable(adapter);
@@ -6418,7 +6418,7 @@ static int e1000_set_features(struct net_device *netdev,
         if (changed & (NETIF_F_TSO | NETIF_F_TSO6))
                 adapter->flags |= FLAG_TSO_FORCE;
 
-        if (!(changed & (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX |
+        if (!(changed & (NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX |
                          NETIF_F_RXCSUM | NETIF_F_RXHASH | NETIF_F_RXFCS |
                          NETIF_F_RXALL)))
                 return 0;
@@ -6629,8 +6629,8 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         /* Set initial default active device features */
         netdev->features = (NETIF_F_SG |
-                            NETIF_F_HW_VLAN_RX |
-                            NETIF_F_HW_VLAN_TX |
+                            NETIF_F_HW_VLAN_CTAG_RX |
+                            NETIF_F_HW_VLAN_CTAG_TX |
                             NETIF_F_TSO |
                             NETIF_F_TSO6 |
                             NETIF_F_RXHASH |
@@ -6644,7 +6644,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         netdev->hw_features |= NETIF_F_RXALL;
 
         if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER)
-                netdev->features |= NETIF_F_HW_VLAN_FILTER;
+                netdev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
 
         netdev->vlan_features |= (NETIF_F_SG |
                                   NETIF_F_TSO |
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 38590252be64..b0b1777c0af6 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -1860,10 +1860,10 @@ static netdev_features_t igb_fix_features(struct net_device *netdev,
         /* Since there is no support for separate Rx/Tx vlan accel
          * enable/disable make sure Tx flag is always in same state as Rx.
          */
-        if (features & NETIF_F_HW_VLAN_RX)
-                features |= NETIF_F_HW_VLAN_TX;
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
+                features |= NETIF_F_HW_VLAN_CTAG_TX;
         else
-                features &= ~NETIF_F_HW_VLAN_TX;
+                features &= ~NETIF_F_HW_VLAN_CTAG_TX;
 
         return features;
 }
@@ -1874,7 +1874,7 @@ static int igb_set_features(struct net_device *netdev,
         netdev_features_t changed = netdev->features ^ features;
         struct igb_adapter *adapter = netdev_priv(netdev);
 
-        if (changed & NETIF_F_HW_VLAN_RX)
+        if (changed & NETIF_F_HW_VLAN_CTAG_RX)
                 igb_vlan_mode(netdev, features);
 
         if (!(changed & NETIF_F_RXALL))
@@ -2127,15 +2127,15 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                             NETIF_F_TSO6 |
                             NETIF_F_RXHASH |
                             NETIF_F_RXCSUM |
-                            NETIF_F_HW_VLAN_RX |
-                            NETIF_F_HW_VLAN_TX;
+                            NETIF_F_HW_VLAN_CTAG_RX |
+                            NETIF_F_HW_VLAN_CTAG_TX;
 
         /* copy netdev features into list of user selectable features */
         netdev->hw_features |= netdev->features;
         netdev->hw_features |= NETIF_F_RXALL;
 
         /* set this bit last since it cannot be part of hw_features */
-        netdev->features |= NETIF_F_HW_VLAN_FILTER;
+        netdev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
 
         netdev->vlan_features |= NETIF_F_TSO |
                                  NETIF_F_TSO6 |
@@ -6674,7 +6674,7 @@ static void igb_process_skb_fields(struct igb_ring *rx_ring,
 
         igb_ptp_rx_hwtstamp(rx_ring->q_vector, rx_desc, skb);
 
-        if ((dev->features & NETIF_F_HW_VLAN_RX) &&
+        if ((dev->features & NETIF_F_HW_VLAN_CTAG_RX) &&
             igb_test_staterr(rx_desc, E1000_RXD_STAT_VP)) {
                 u16 vid;
                 if (igb_test_staterr(rx_desc, E1000_RXDEXT_STATERR_LB) &&
@@ -6954,7 +6954,7 @@ static void igb_vlan_mode(struct net_device *netdev, netdev_features_t features)
         struct igb_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
         u32 ctrl, rctl;
-        bool enable = !!(features & NETIF_F_HW_VLAN_RX);
+        bool enable = !!(features & NETIF_F_HW_VLAN_CTAG_RX);
 
         if (enable) {
                 /* enable VLAN tag insert/strip */
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index bea46bb26061..33e7b3069fb6 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -2722,9 +2722,9 @@ static int igbvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                            NETIF_F_RXCSUM;
 
         netdev->features = netdev->hw_features |
-                           NETIF_F_HW_VLAN_TX |
-                           NETIF_F_HW_VLAN_RX |
-                           NETIF_F_HW_VLAN_FILTER;
+                           NETIF_F_HW_VLAN_CTAG_TX |
+                           NETIF_F_HW_VLAN_CTAG_RX |
+                           NETIF_F_HW_VLAN_CTAG_FILTER;
 
         if (pci_using_dac)
                 netdev->features |= NETIF_F_HIGHDMA;
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index 5dc119fd95a8..e65d9e910227 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -332,8 +332,8 @@ ixgb_fix_features(struct net_device *netdev, netdev_features_t features)
          * Tx VLAN insertion does not work per HW design when Rx stripping is
          * disabled.
          */
-        if (!(features & NETIF_F_HW_VLAN_RX))
-                features &= ~NETIF_F_HW_VLAN_TX;
+        if (!(features & NETIF_F_HW_VLAN_CTAG_RX))
+                features &= ~NETIF_F_HW_VLAN_CTAG_TX;
 
         return features;
 }
@@ -344,7 +344,7 @@ ixgb_set_features(struct net_device *netdev, netdev_features_t features)
         struct ixgb_adapter *adapter = netdev_priv(netdev);
         netdev_features_t changed = features ^ netdev->features;
 
-        if (!(changed & (NETIF_F_RXCSUM|NETIF_F_HW_VLAN_RX)))
+        if (!(changed & (NETIF_F_RXCSUM|NETIF_F_HW_VLAN_CTAG_RX)))
                 return 0;
 
         adapter->rx_csum = !!(features & NETIF_F_RXCSUM);
@@ -479,10 +479,10 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         netdev->hw_features = NETIF_F_SG |
                            NETIF_F_TSO |
                            NETIF_F_HW_CSUM |
-                           NETIF_F_HW_VLAN_TX |
-                           NETIF_F_HW_VLAN_RX;
+                           NETIF_F_HW_VLAN_CTAG_TX |
+                           NETIF_F_HW_VLAN_CTAG_RX;
         netdev->features = netdev->hw_features |
-                           NETIF_F_HW_VLAN_FILTER;
+                           NETIF_F_HW_VLAN_CTAG_FILTER;
         netdev->hw_features |= NETIF_F_RXCSUM;
 
         if (pci_using_dac) {
@@ -1140,7 +1140,7 @@ ixgb_set_multi(struct net_device *netdev)
         }
 
 alloc_failed:
-        if (netdev->features & NETIF_F_HW_VLAN_RX)
+        if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX)
                 ixgb_vlan_strip_enable(adapter);
         else
                 ixgb_vlan_strip_disable(adapter);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index c022f9c417a6..0316b65dfe06 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -1488,7 +1488,7 @@ static void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring,
 
         ixgbe_ptp_rx_hwtstamp(rx_ring, rx_desc, skb);
 
-        if ((dev->features & NETIF_F_HW_VLAN_RX) &&
+        if ((dev->features & NETIF_F_HW_VLAN_CTAG_RX) &&
             ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_VP)) {
                 u16 vid = le16_to_cpu(rx_desc->wb.upper.vlan);
                 __vlan_hwaccel_put_tag(skb, vid);
@@ -3722,7 +3722,7 @@ void ixgbe_set_rx_mode(struct net_device *netdev)
 
         IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl);
 
-        if (netdev->features & NETIF_F_HW_VLAN_RX)
+        if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX)
                 ixgbe_vlan_strip_enable(adapter);
         else
                 ixgbe_vlan_strip_disable(adapter);
@@ -7024,7 +7024,7 @@ static int ixgbe_set_features(struct net_device *netdev,
                 break;
         }
 
-        if (features & NETIF_F_HW_VLAN_RX)
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
                 ixgbe_vlan_strip_enable(adapter);
         else
                 ixgbe_vlan_strip_disable(adapter);
@@ -7431,9 +7431,9 @@ skip_sriov:
         netdev->features = NETIF_F_SG |
                            NETIF_F_IP_CSUM |
                            NETIF_F_IPV6_CSUM |
-                           NETIF_F_HW_VLAN_TX |
-                           NETIF_F_HW_VLAN_RX |
-                           NETIF_F_HW_VLAN_FILTER |
+                           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 |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index b3e6530637e3..2d4bdcc4fdbe 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
@@ -35,7 +35,7 @@
 #include <linux/ip.h>
 #include <linux/tcp.h>
 #include <linux/ipv6.h>
-#ifdef NETIF_F_HW_VLAN_TX
+#ifdef NETIF_F_HW_VLAN_CTAG_TX
 #include <linux/if_vlan.h>
 #endif
 
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index eeae9349f78b..8f907b7af319 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -3410,9 +3410,9 @@ static int ixgbevf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                            NETIF_F_RXCSUM;
 
         netdev->features = netdev->hw_features |
-                           NETIF_F_HW_VLAN_TX |
-                           NETIF_F_HW_VLAN_RX |
-                           NETIF_F_HW_VLAN_FILTER;
+                           NETIF_F_HW_VLAN_CTAG_TX |
+                           NETIF_F_HW_VLAN_CTAG_RX |
+                           NETIF_F_HW_VLAN_CTAG_FILTER;
 
         netdev->vlan_features |= NETIF_F_TSO;
         netdev->vlan_features |= NETIF_F_TSO6;