net: vlan: rename NETIF_F_HW_VLAN_* feature flags to NETIF_F_HW_VLAN_CTAG_*

Rename the hardware VLAN acceleration features to include "CTAG" to indicate
that they only support CTAGs. Follow up patches will introduce 802.1ad
server provider tagging (STAGs) and require the distinction for hardware not
supporting acclerating both.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 8 insertions, 7 deletions

diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
index 7fcac2003769..73aef76a526c 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
@@ -1100,10 +1100,10 @@ static netdev_features_t cxgb4vf_fix_features(struct net_device *dev,
          * 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;
 }
@@ -1114,9 +1114,9 @@ static int cxgb4vf_set_features(struct net_device *dev,
         struct port_info *pi = netdev_priv(dev);
         netdev_features_t changed = dev->features ^ features;
 
-        if (changed & NETIF_F_HW_VLAN_RX)
+        if (changed & NETIF_F_HW_VLAN_CTAG_RX)
                 t4vf_set_rxmode(pi->adapter, pi->viid, -1, -1, -1, -1,
-                                features & NETIF_F_HW_VLAN_TX, 0);
+                                features & NETIF_F_HW_VLAN_CTAG_TX, 0);
 
         return 0;
 }
@@ -2623,11 +2623,12 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,
 
                 netdev->hw_features = NETIF_F_SG | TSO_FLAGS |
                         NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
-                        NETIF_F_HW_VLAN_RX | NETIF_F_RXCSUM;
+                        NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_RXCSUM;
                 netdev->vlan_features = NETIF_F_SG | TSO_FLAGS |
                         NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
                         NETIF_F_HIGHDMA;
-                netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_TX;
+                netdev->features = netdev->hw_features |
+                                   NETIF_F_HW_VLAN_CTAG_TX;
                 if (pci_using_dac)
                         netdev->features |= NETIF_F_HIGHDMA;