Skip to content

Commit 49675f5

Browse files
committed
net: remove IFF_* re-definition
We re-define values of enum netdev_priv_flags as preprocessor macros with the same name. I guess this was done to avoid breaking out of tree modules which may use #ifdef X for kernel compatibility? Commit 7aa9804 ("net: move net_device priv_flags out from UAPI") which added the enum doesn't say. In any case, the flags with defines are quite old now, and defines for new flags don't get added. OOT drivers have to resort to code greps for compat detection, anyway. Let's delete these defines, save LoC, help LXR link to the right place. Reviewed-by: Simon Horman <[email protected]> Reviewed-by: Jiri Pirko <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent ce21e52 commit 49675f5

File tree

1 file changed

+0
-32
lines changed

1 file changed

+0
-32
lines changed

include/linux/netdevice.h

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1689,38 +1689,6 @@ enum netdev_priv_flags {
16891689
IFF_SEE_ALL_HWTSTAMP_REQUESTS = BIT_ULL(33),
16901690
};
16911691

1692-
#define IFF_802_1Q_VLAN IFF_802_1Q_VLAN
1693-
#define IFF_EBRIDGE IFF_EBRIDGE
1694-
#define IFF_BONDING IFF_BONDING
1695-
#define IFF_ISATAP IFF_ISATAP
1696-
#define IFF_WAN_HDLC IFF_WAN_HDLC
1697-
#define IFF_XMIT_DST_RELEASE IFF_XMIT_DST_RELEASE
1698-
#define IFF_DONT_BRIDGE IFF_DONT_BRIDGE
1699-
#define IFF_DISABLE_NETPOLL IFF_DISABLE_NETPOLL
1700-
#define IFF_MACVLAN_PORT IFF_MACVLAN_PORT
1701-
#define IFF_BRIDGE_PORT IFF_BRIDGE_PORT
1702-
#define IFF_OVS_DATAPATH IFF_OVS_DATAPATH
1703-
#define IFF_TX_SKB_SHARING IFF_TX_SKB_SHARING
1704-
#define IFF_UNICAST_FLT IFF_UNICAST_FLT
1705-
#define IFF_TEAM_PORT IFF_TEAM_PORT
1706-
#define IFF_SUPP_NOFCS IFF_SUPP_NOFCS
1707-
#define IFF_LIVE_ADDR_CHANGE IFF_LIVE_ADDR_CHANGE
1708-
#define IFF_MACVLAN IFF_MACVLAN
1709-
#define IFF_XMIT_DST_RELEASE_PERM IFF_XMIT_DST_RELEASE_PERM
1710-
#define IFF_L3MDEV_MASTER IFF_L3MDEV_MASTER
1711-
#define IFF_NO_QUEUE IFF_NO_QUEUE
1712-
#define IFF_OPENVSWITCH IFF_OPENVSWITCH
1713-
#define IFF_L3MDEV_SLAVE IFF_L3MDEV_SLAVE
1714-
#define IFF_TEAM IFF_TEAM
1715-
#define IFF_RXFH_CONFIGURED IFF_RXFH_CONFIGURED
1716-
#define IFF_PHONY_HEADROOM IFF_PHONY_HEADROOM
1717-
#define IFF_MACSEC IFF_MACSEC
1718-
#define IFF_NO_RX_HANDLER IFF_NO_RX_HANDLER
1719-
#define IFF_FAILOVER IFF_FAILOVER
1720-
#define IFF_FAILOVER_SLAVE IFF_FAILOVER_SLAVE
1721-
#define IFF_L3MDEV_RX_HANDLER IFF_L3MDEV_RX_HANDLER
1722-
#define IFF_TX_SKB_NO_LINEAR IFF_TX_SKB_NO_LINEAR
1723-
17241692
/* Specifies the type of the struct net_device::ml_priv pointer */
17251693
enum netdev_ml_priv_type {
17261694
ML_PRIV_NONE,

0 commit comments

Comments
 (0)