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

Commit 48b4e51f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-is_enabled' 



Javier Martinez Canillas says:

====================
net: use IS_ENABLED() instead of checking for built-in or module

This trivial series replace the open coding to check for a Kconfig symbol
being built-in or module, with IS_ENABLED() macro that does exactly that.

Using the macro makes the code more readable by helping abstract away some
of the Kconfig built-in and module enable details.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 34c1b089 65b323e2

net/appletalk/ddp.c

+1 −1
Original line number Diff line number Diff line
@@ -1278,7 +1278,7 @@ static int atalk_getname(struct socket *sock, struct sockaddr *uaddr, 
	return err;

}



#if defined(CONFIG_IPDDP) || defined(CONFIG_IPDDP_MODULE)

#if IS_ENABLED(CONFIG_IPDDP)

static __inline__ int is_ip_over_ddp(struct sk_buff *skb)

{

	return skb->data[12] == 22;

net/atm/lec.c

+6 −6
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <linux/atmlec.h>



/* Proxy LEC knows about bridging */

#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)

#if IS_ENABLED(CONFIG_BRIDGE)

#include "../bridge/br_private.h"



static unsigned char bridge_ula_lec[] = { 0x01, 0x80, 0xc2, 0x00, 0x00 };
@@ -121,7 +121,7 @@ static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; 
/* Device structures */

static struct net_device *dev_lec[MAX_LEC_ITF];



#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)

#if IS_ENABLED(CONFIG_BRIDGE)

static void lec_handle_bridge(struct sk_buff *skb, struct net_device *dev)

{

	char *buff;
@@ -155,7 +155,7 @@ static void lec_handle_bridge(struct sk_buff *skb, struct net_device *dev) 
		sk->sk_data_ready(sk);

	}

}

#endif /* defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) */

#endif /* IS_ENABLED(CONFIG_BRIDGE) */



/*

 * Open/initialize the netdevice. This is called (in the current kernel)
@@ -222,7 +222,7 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb, 
	pr_debug("skbuff head:%lx data:%lx tail:%lx end:%lx\n",

		 (long)skb->head, (long)skb->data, (long)skb_tail_pointer(skb),

		 (long)skb_end_pointer(skb));

#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)

#if IS_ENABLED(CONFIG_BRIDGE)

	if (memcmp(skb->data, bridge_ula_lec, sizeof(bridge_ula_lec)) == 0)

		lec_handle_bridge(skb, dev);

#endif
@@ -426,7 +426,7 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb) 
		    (unsigned short)(0xffff & mesg->content.normal.flag);

		break;

	case l_should_bridge:

#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)

#if IS_ENABLED(CONFIG_BRIDGE)

	{

		pr_debug("%s: bridge zeppelin asks about %pM\n",

			 dev->name, mesg->content.proxy.mac_addr);
@@ -452,7 +452,7 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb) 
			sk->sk_data_ready(sk);

		}

	}

#endif /* defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) */

#endif /* IS_ENABLED(CONFIG_BRIDGE) */

		break;

	default:

		pr_info("%s: Unknown message type %d\n", dev->name, mesg->type);

net/core/dev.c

+1 −2
Original line number Diff line number Diff line
@@ -3904,8 +3904,7 @@ static void net_tx_action(struct softirq_action *h) 
	}

}



#if (defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)) && \

    (defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE))

#if IS_ENABLED(CONFIG_BRIDGE) && IS_ENABLED(CONFIG_ATM_LANE)

/* This hook is defined here for ATM LANE */

int (*br_fdb_test_addr_hook)(struct net_device *dev,

			     unsigned char *addr) __read_mostly;

net/ipv4/ip_output.c

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from) 
	to->tc_index = from->tc_index;

#endif

	nf_copy(to, from);

#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)

#if IS_ENABLED(CONFIG_IP_VS)

	to->ipvs_property = from->ipvs_property;

#endif

	skb_copy_secmark(to, from);

net/l2tp/l2tp_core.h

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ struct l2tp_session { 
	void (*session_close)(struct l2tp_session *session);

	void (*ref)(struct l2tp_session *session);

	void (*deref)(struct l2tp_session *session);

#if defined(CONFIG_L2TP_DEBUGFS) || defined(CONFIG_L2TP_DEBUGFS_MODULE)

#if IS_ENABLED(CONFIG_L2TP_DEBUGFS)

	void (*show)(struct seq_file *m, void *priv);

#endif

	uint8_t			priv[0];	/* private data */