net:x25: use IS_ENABLED

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

Signed-off-by: Igor Maravić <igorm@etf.rs>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 3e16c6abde4f4bea8a800dbecfd2d98068d37cf8..a306bc66000e3ddece36a4743c35523f606cfee5 100644 (file)
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -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
         ) {

diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c
index fa2b41888bd9a78b931ff6a6be418de56498fe6b..f0ce862d1f46309b5482e7594be438e6744e2566 100644 (file)
--- a/net/x25/x25_dev.c
+++ b/net/x25/x25_dev.c
@@ -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;

diff --git a/net/x25/x25_route.c b/net/x25/x25_route.c
index 97d77c532d8c95550711c915cb2b02d65d99828f..cf6366270054f10750b924543aa1c8df38a5027f 100644 (file)
--- a/net/x25/x25_route.c
+++ b/net/x25/x25_route.c
@@ -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
                                        ))){