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

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
...@@ -232,7 +232,7 @@ static int x25_device_event(struct notifier_block *this, unsigned long event, ...@@ -232,7 +232,7 @@ static int x25_device_event(struct notifier_block *this, unsigned long event,
return NOTIFY_DONE; return NOTIFY_DONE;
if (dev->type == ARPHRD_X25 if (dev->type == ARPHRD_X25
#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE) #if IS_ENABLED(CONFIG_LLC)
|| dev->type == ARPHRD_ETHER || dev->type == ARPHRD_ETHER
#endif #endif
) { ) {
......
...@@ -161,7 +161,7 @@ void x25_establish_link(struct x25_neigh *nb) ...@@ -161,7 +161,7 @@ void x25_establish_link(struct x25_neigh *nb)
*ptr = X25_IFACE_CONNECT; *ptr = X25_IFACE_CONNECT;
break; break;
#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE) #if IS_ENABLED(CONFIG_LLC)
case ARPHRD_ETHER: case ARPHRD_ETHER:
return; return;
#endif #endif
...@@ -180,7 +180,7 @@ void x25_terminate_link(struct x25_neigh *nb) ...@@ -180,7 +180,7 @@ void x25_terminate_link(struct x25_neigh *nb)
struct sk_buff *skb; struct sk_buff *skb;
unsigned char *ptr; unsigned char *ptr;
#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE) #if IS_ENABLED(CONFIG_LLC)
if (nb->dev->type == ARPHRD_ETHER) if (nb->dev->type == ARPHRD_ETHER)
return; return;
#endif #endif
...@@ -213,7 +213,7 @@ void x25_send_frame(struct sk_buff *skb, struct x25_neigh *nb) ...@@ -213,7 +213,7 @@ void x25_send_frame(struct sk_buff *skb, struct x25_neigh *nb)
*dptr = X25_IFACE_DATA; *dptr = X25_IFACE_DATA;
break; break;
#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE) #if IS_ENABLED(CONFIG_LLC)
case ARPHRD_ETHER: case ARPHRD_ETHER:
kfree_skb(skb); kfree_skb(skb);
return; return;
......
...@@ -134,7 +134,7 @@ struct net_device *x25_dev_get(char *devname) ...@@ -134,7 +134,7 @@ struct net_device *x25_dev_get(char *devname)
if (dev && if (dev &&
(!(dev->flags & IFF_UP) || (dev->type != ARPHRD_X25 (!(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 && dev->type != ARPHRD_ETHER
#endif #endif
))){ ))){
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment