diff options
author | Igor Maravić <igorm@etf.rs> | 2011-12-11 21:58:25 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-16 15:49:52 -0500 |
commit | e6373c4c0ecb3a944c34117a3daeac315d641b5f (patch) | |
tree | 25f21dc82327c56474b0e894c832faef084c176b /net/bridge/br.c | |
parent | c0cd115667bcd23c2a31fe2114beaab3608de68c (diff) |
net:bridge: 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>
Diffstat (limited to 'net/bridge/br.c')
-rw-r--r-- | net/bridge/br.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br.c b/net/bridge/br.c index f20c4fd915a8..ba780cc8e515 100644 --- a/net/bridge/br.c +++ b/net/bridge/br.c | |||
@@ -62,7 +62,7 @@ static int __init br_init(void) | |||
62 | 62 | ||
63 | brioctl_set(br_ioctl_deviceless_stub); | 63 | brioctl_set(br_ioctl_deviceless_stub); |
64 | 64 | ||
65 | #if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE) | 65 | #if IS_ENABLED(CONFIG_ATM_LANE) |
66 | br_fdb_test_addr_hook = br_fdb_test_addr; | 66 | br_fdb_test_addr_hook = br_fdb_test_addr; |
67 | #endif | 67 | #endif |
68 | 68 | ||
@@ -93,7 +93,7 @@ static void __exit br_deinit(void) | |||
93 | rcu_barrier(); /* Wait for completion of call_rcu()'s */ | 93 | rcu_barrier(); /* Wait for completion of call_rcu()'s */ |
94 | 94 | ||
95 | br_netfilter_fini(); | 95 | br_netfilter_fini(); |
96 | #if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE) | 96 | #if IS_ENABLED(CONFIG_ATM_LANE) |
97 | br_fdb_test_addr_hook = NULL; | 97 | br_fdb_test_addr_hook = NULL; |
98 | #endif | 98 | #endif |
99 | 99 | ||