diff options
| author | Javier Martinez Canillas <javier@osg.samsung.com> | 2016-09-09 08:43:15 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-10 21:19:10 -0700 |
| commit | 181402a5c7899fad945485130ded47ca2bf1161e (patch) | |
| tree | 3843b4776697acfb748c7f47bfa56a9ed5a627c9 /net/core | |
| parent | 9a81c34ace3598188f633d4654a2a57b7f7a2c2a (diff) | |
| download | talos-obmc-linux-181402a5c7899fad945485130ded47ca2bf1161e.tar.gz talos-obmc-linux-181402a5c7899fad945485130ded47ca2bf1161e.zip | |
net: 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: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 34b5322bc081..b0d307b6af19 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -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; |
