Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d11ead75 authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

net: Use IS_ENABLED() in netdevice.h as appropriate 



Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 34a430d7

include/linux/netdevice.h

+8 −10
Original line number Original line Diff line number Diff line
@@ -144,22 +144,20 @@ static inline bool dev_xmit_complete(int rc) 
 *	used.

 *	used.

 */

 */





#if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)

#if defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25)

# if defined(CONFIG_MAC80211_MESH)

# if defined(CONFIG_MAC80211_MESH)

#  define LL_MAX_HEADER 128

#  define LL_MAX_HEADER 128

# else

# else

#  define LL_MAX_HEADER 96

#  define LL_MAX_HEADER 96

# endif

# endif

#elif defined(CONFIG_TR) || defined(CONFIG_TR_MODULE)

#elif IS_ENABLED(CONFIG_TR)

# define LL_MAX_HEADER 48

# define LL_MAX_HEADER 48

#else

#else

# define LL_MAX_HEADER 32

# define LL_MAX_HEADER 32

#endif

#endif





#if !defined(CONFIG_NET_IPIP) && !defined(CONFIG_NET_IPIP_MODULE) && \

#if !IS_ENABLED(CONFIG_NET_IPIP) && !IS_ENABLED(CONFIG_NET_IPGRE) && \

    !defined(CONFIG_NET_IPGRE) &&  !defined(CONFIG_NET_IPGRE_MODULE) && \

    !IS_ENABLED(CONFIG_IPV6_SIT) && !IS_ENABLED(CONFIG_IPV6_TUNNEL)

    !defined(CONFIG_IPV6_SIT) && !defined(CONFIG_IPV6_SIT_MODULE) && \

    !defined(CONFIG_IPV6_TUNNEL) && !defined(CONFIG_IPV6_TUNNEL_MODULE)

#define MAX_HEADER LL_MAX_HEADER

#define MAX_HEADER LL_MAX_HEADER

#else

#else

#define MAX_HEADER (LL_MAX_HEADER + 48)

#define MAX_HEADER (LL_MAX_HEADER + 48)
@@ -922,7 +920,7 @@ struct net_device_ops { 
	int			(*ndo_get_vf_port)(struct net_device *dev,

	int			(*ndo_get_vf_port)(struct net_device *dev,

						   int vf, struct sk_buff *skb);

						   int vf, struct sk_buff *skb);

	int			(*ndo_setup_tc)(struct net_device *dev, u8 tc);

	int			(*ndo_setup_tc)(struct net_device *dev, u8 tc);

#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)

#if IS_ENABLED(CONFIG_FCOE)

	int			(*ndo_fcoe_enable)(struct net_device *dev);

	int			(*ndo_fcoe_enable)(struct net_device *dev);

	int			(*ndo_fcoe_disable)(struct net_device *dev);

	int			(*ndo_fcoe_disable)(struct net_device *dev);

	int			(*ndo_fcoe_ddp_setup)(struct net_device *dev,

	int			(*ndo_fcoe_ddp_setup)(struct net_device *dev,
@@ -937,7 +935,7 @@ struct net_device_ops { 
						       unsigned int sgc);

						       unsigned int sgc);

#endif

#endif





#if defined(CONFIG_LIBFCOE) || defined(CONFIG_LIBFCOE_MODULE)

#if IS_ENABLED(CONFIG_LIBFCOE)

#define NETDEV_FCOE_WWNN 0

#define NETDEV_FCOE_WWNN 0

#define NETDEV_FCOE_WWPN 1

#define NETDEV_FCOE_WWPN 1

	int			(*ndo_fcoe_get_wwn)(struct net_device *dev,

	int			(*ndo_fcoe_get_wwn)(struct net_device *dev,
@@ -1076,7 +1074,7 @@ struct net_device { 




	/* Protocol specific pointers */

	/* Protocol specific pointers */





#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)

#if IS_ENABLED(CONFIG_VLAN_8021Q)

	struct vlan_group __rcu	*vlgrp;		/* VLAN group */

	struct vlan_group __rcu	*vlgrp;		/* VLAN group */

#endif

#endif

#if IS_ENABLED(CONFIG_NET_DSA)

#if IS_ENABLED(CONFIG_NET_DSA)
@@ -1242,7 +1240,7 @@ struct net_device { 
	struct netdev_tc_txq tc_to_txq[TC_MAX_QUEUE];

	struct netdev_tc_txq tc_to_txq[TC_MAX_QUEUE];

	u8 prio_tc_map[TC_BITMASK + 1];

	u8 prio_tc_map[TC_BITMASK + 1];





#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)

#if IS_ENABLED(CONFIG_FCOE)

	/* max exchange id for FCoE LRO by ddp */

	/* max exchange id for FCoE LRO by ddp */

	unsigned int		fcoe_ddp_xid;

	unsigned int		fcoe_ddp_xid;

#endif

#endif