Commit 9a81c34a authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by David S. Miller
Browse files

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



The IS_ENABLED() macro checks if a Kconfig symbol has been enabled either
built-in or as a module, use that macro instead of open coding the same.

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 avatarJavier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a73ec314

net/atm/lec.c

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

#include <linux/atmlec.h>





/* Proxy LEC knows about bridging */

/* Proxy LEC knows about bridging */

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

#if IS_ENABLED(CONFIG_BRIDGE)

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

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





static unsigned char bridge_ula_lec[] = { 0x01, 0x80, 0xc2, 0x00, 0x00 };

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 */

/* Device structures */

static struct net_device *dev_lec[MAX_LEC_ITF];

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)

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

{

{

	char *buff;

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

		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)

 * 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",

	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->head, (long)skb->data, (long)skb_tail_pointer(skb),

		 (long)skb_end_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)

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

		lec_handle_bridge(skb, dev);

		lec_handle_bridge(skb, dev);

#endif

#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);

		    (unsigned short)(0xffff & mesg->content.normal.flag);

		break;

		break;

	case l_should_bridge:

	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",

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

			 dev->name, mesg->content.proxy.mac_addr);

			 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);

			sk->sk_data_ready(sk);

		}

		}

	}

	}

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

#endif /* IS_ENABLED(CONFIG_BRIDGE) */

		break;

		break;

	default:

	default:

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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE