summaryrefslogtreecommitdiffstats
path: root/net/bridge/br.c
diff options
context:
space:
mode:
authorIgor Maravić <igorm@etf.rs>2011-12-12 02:58:25 +0000
committerDavid S. Miller <davem@davemloft.net>2011-12-16 15:49:52 -0500
commite6373c4c0ecb3a944c34117a3daeac315d641b5f (patch)
tree25f21dc82327c56474b0e894c832faef084c176b /net/bridge/br.c
parentc0cd115667bcd23c2a31fe2114beaab3608de68c (diff)
downloadlinux-e6373c4c0ecb3a944c34117a3daeac315d641b5f.tar.gz
linux-e6373c4c0ecb3a944c34117a3daeac315d641b5f.tar.bz2
linux-e6373c4c0ecb3a944c34117a3daeac315d641b5f.zip
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.c4
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)
brioctl_set(br_ioctl_deviceless_stub);
-#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
+#if IS_ENABLED(CONFIG_ATM_LANE)
br_fdb_test_addr_hook = br_fdb_test_addr;
#endif
@@ -93,7 +93,7 @@ static void __exit br_deinit(void)
rcu_barrier(); /* Wait for completion of call_rcu()'s */
br_netfilter_fini();
-#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
+#if IS_ENABLED(CONFIG_ATM_LANE)
br_fdb_test_addr_hook = NULL;
#endif