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

Commit 29c36262 authored by Igor Maravić's avatar Igor Maravić Committed by David S. Miller
Browse files

net:x25: use IS_ENABLED 



Use IS_ENABLED(CONFIG_FOO)
instead of defined(CONFIG_FOO) || defined (CONFIG_FOO_MODULE)

Signed-off-by: default avatarIgor Maravić <igorm@etf.rs>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a3bf7ae9

net/x25/af_x25.c

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ static int x25_device_event(struct notifier_block *this, unsigned long event, 
		return NOTIFY_DONE;



	if (dev->type == ARPHRD_X25

#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE)

#if IS_ENABLED(CONFIG_LLC)

	 || dev->type == ARPHRD_ETHER

#endif

	 ) {

net/x25/x25_dev.c

+3 −3
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ void x25_establish_link(struct x25_neigh *nb) 
		*ptr = X25_IFACE_CONNECT;

		break;



#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE)

#if IS_ENABLED(CONFIG_LLC)

	case ARPHRD_ETHER:

		return;

#endif
@@ -180,7 +180,7 @@ void x25_terminate_link(struct x25_neigh *nb) 
	struct sk_buff *skb;

	unsigned char *ptr;



#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE)

#if IS_ENABLED(CONFIG_LLC)

	if (nb->dev->type == ARPHRD_ETHER)

		return;

#endif
@@ -213,7 +213,7 @@ void x25_send_frame(struct sk_buff *skb, struct x25_neigh *nb) 
		*dptr = X25_IFACE_DATA;

		break;



#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE)

#if IS_ENABLED(CONFIG_LLC)

	case ARPHRD_ETHER:

		kfree_skb(skb);

		return;

net/x25/x25_route.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ struct net_device *x25_dev_get(char *devname) 


	if (dev &&

	    (!(dev->flags & IFF_UP) || (dev->type != ARPHRD_X25

#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE)

#if IS_ENABLED(CONFIG_LLC)

					&& dev->type != ARPHRD_ETHER

#endif

					))){