netdev_features: remove NETIF_F_ALL_FCOE

NETIF_F_ALL_FCOE is used only in vlan_dev.c, 2 times. Now that it's only
2 bits, open-code it and remove the definition from netdev_features.h.

Suggested-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Alexander Lobakin <aleksander.lobakin@intel.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h
index 37af2c6e7caf1568571dd3726d0cc64df88f6b40..66e7d26b70a4fe575608bfb02a2dbd262370e714 100644 (file)
--- a/include/linux/netdev_features.h
+++ b/include/linux/netdev_features.h
@@ -209,8 +209,6 @@ static inline int find_next_netdev_feature(u64 feature, unsigned long start)
 #define NETIF_F_ALL_TSO        (NETIF_F_TSO | NETIF_F_TSO6 | \
                                 NETIF_F_TSO_ECN | NETIF_F_TSO_MANGLEID)
 
-#define NETIF_F_ALL_FCOE       (NETIF_F_FCOE_CRC | NETIF_F_FSO)
-
 /* List of features with software fallbacks. */
 #define NETIF_F_GSO_SOFTWARE   (NETIF_F_ALL_TSO | NETIF_F_GSO_SCTP |        \
                                 NETIF_F_GSO_UDP_L4 | NETIF_F_GSO_FRAGLIST)

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 09b46b057ab297e11cd88805b9ce0be8c7d4b0ea..458040e8a0e0be007012fd25499405e89799de00 100644 (file)
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -564,7 +564,7 @@ static int vlan_dev_init(struct net_device *dev)
                           NETIF_F_FRAGLIST | NETIF_F_GSO_SOFTWARE |
                           NETIF_F_GSO_ENCAP_ALL |
                           NETIF_F_HIGHDMA | NETIF_F_SCTP_CRC |
-                          NETIF_F_ALL_FCOE;
+                          NETIF_F_FCOE_CRC | NETIF_F_FSO;
 
        if (real_dev->vlan_features & NETIF_F_HW_MACSEC)
                dev->hw_features |= NETIF_F_HW_MACSEC;
@@ -576,7 +576,8 @@ static int vlan_dev_init(struct net_device *dev)
        if (dev->features & NETIF_F_VLAN_FEATURES)
                netdev_warn(real_dev, "VLAN features are set incorrectly.  Q-in-Q configurations may not work correctly.\n");
 
-       dev->vlan_features = real_dev->vlan_features & ~NETIF_F_ALL_FCOE;
+       dev->vlan_features = real_dev->vlan_features &
+                            ~(NETIF_F_FCOE_CRC | NETIF_F_FSO);
        dev->hw_enc_features = vlan_tnl_features(real_dev);
        dev->mpls_features = real_dev->mpls_features;