Skip to content

Commit 043963c

Browse files
committed
netdev_features: remove NETIF_F_ALL_FCOE
JIRA: https://issues.redhat.com/browse/RHEL-59091 commit a61fec1 Author: Alexander Lobakin <aleksander.lobakin@intel.com> Date: Thu Aug 29 14:33:40 2024 +0200 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> Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
1 parent 6dfb2f2 commit 043963c

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

include/linux/netdev_features.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,6 @@ static inline int find_next_netdev_feature(u64 feature, unsigned long start)
209209
#define NETIF_F_ALL_TSO (NETIF_F_TSO | NETIF_F_TSO6 | \
210210
NETIF_F_TSO_ECN | NETIF_F_TSO_MANGLEID)
211211

212-
#define NETIF_F_ALL_FCOE (NETIF_F_FCOE_CRC | NETIF_F_FSO)
213-
214212
/* List of features with software fallbacks. */
215213
#define NETIF_F_GSO_SOFTWARE (NETIF_F_ALL_TSO | NETIF_F_GSO_SCTP | \
216214
NETIF_F_GSO_UDP_L4 | NETIF_F_GSO_FRAGLIST)

net/8021q/vlan_dev.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ static int vlan_dev_init(struct net_device *dev)
564564
NETIF_F_FRAGLIST | NETIF_F_GSO_SOFTWARE |
565565
NETIF_F_GSO_ENCAP_ALL |
566566
NETIF_F_HIGHDMA | NETIF_F_SCTP_CRC |
567-
NETIF_F_ALL_FCOE;
567+
NETIF_F_FCOE_CRC | NETIF_F_FSO;
568568

569569
if (real_dev->vlan_features & NETIF_F_HW_MACSEC)
570570
dev->hw_features |= NETIF_F_HW_MACSEC;
@@ -576,7 +576,8 @@ static int vlan_dev_init(struct net_device *dev)
576576
if (dev->features & NETIF_F_VLAN_FEATURES)
577577
netdev_warn(real_dev, "VLAN features are set incorrectly. Q-in-Q configurations may not work correctly.\n");
578578

579-
dev->vlan_features = real_dev->vlan_features & ~NETIF_F_ALL_FCOE;
579+
dev->vlan_features = real_dev->vlan_features &
580+
~(NETIF_F_FCOE_CRC | NETIF_F_FSO);
580581
dev->hw_enc_features = vlan_tnl_features(real_dev);
581582
dev->mpls_features = real_dev->mpls_features;
582583

0 commit comments

Comments
 (0)