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 | |
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>
-rw-r--r-- | net/bridge/br.c | 4 | ||||
-rw-r--r-- | net/bridge/br_fdb.c | 2 | ||||
-rw-r--r-- | net/bridge/br_netfilter.c | 2 | ||||
-rw-r--r-- | net/bridge/br_private.h | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_log.c | 2 |
5 files changed, 6 insertions, 6 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 | ||
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index a1429afca443..f963f6b1884f 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c | |||
@@ -247,7 +247,7 @@ struct net_bridge_fdb_entry *__br_fdb_get(struct net_bridge *br, | |||
247 | return NULL; | 247 | return NULL; |
248 | } | 248 | } |
249 | 249 | ||
250 | #if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE) | 250 | #if IS_ENABLED(CONFIG_ATM_LANE) |
251 | /* Interface used by ATM LANE hook to test | 251 | /* Interface used by ATM LANE hook to test |
252 | * if an addr is on some other bridge port */ | 252 | * if an addr is on some other bridge port */ |
253 | int br_fdb_test_addr(struct net_device *dev, unsigned char *addr) | 253 | int br_fdb_test_addr(struct net_device *dev, unsigned char *addr) |
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 834dfabb30f9..52e44605fb7b 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c | |||
@@ -807,7 +807,7 @@ static unsigned int br_nf_forward_arp(unsigned int hook, struct sk_buff *skb, | |||
807 | return NF_STOLEN; | 807 | return NF_STOLEN; |
808 | } | 808 | } |
809 | 809 | ||
810 | #if defined(CONFIG_NF_CONNTRACK_IPV4) || defined(CONFIG_NF_CONNTRACK_IPV4_MODULE) | 810 | #if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV4) |
811 | static int br_nf_dev_queue_xmit(struct sk_buff *skb) | 811 | static int br_nf_dev_queue_xmit(struct sk_buff *skb) |
812 | { | 812 | { |
813 | int ret; | 813 | int ret; |
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 57dcd1489f3f..0b67a63ad7a8 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h | |||
@@ -537,7 +537,7 @@ extern void br_stp_port_timer_init(struct net_bridge_port *p); | |||
537 | extern unsigned long br_timer_value(const struct timer_list *timer); | 537 | extern unsigned long br_timer_value(const struct timer_list *timer); |
538 | 538 | ||
539 | /* br.c */ | 539 | /* br.c */ |
540 | #if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE) | 540 | #if IS_ENABLED(CONFIG_ATM_LANE) |
541 | extern int (*br_fdb_test_addr_hook)(struct net_device *dev, unsigned char *addr); | 541 | extern int (*br_fdb_test_addr_hook)(struct net_device *dev, unsigned char *addr); |
542 | #endif | 542 | #endif |
543 | 543 | ||
diff --git a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c index 88d7d1d1cb1b..f88ee537fb2b 100644 --- a/net/bridge/netfilter/ebt_log.c +++ b/net/bridge/netfilter/ebt_log.c | |||
@@ -107,7 +107,7 @@ ebt_log_packet(u_int8_t pf, unsigned int hooknum, | |||
107 | goto out; | 107 | goto out; |
108 | } | 108 | } |
109 | 109 | ||
110 | #if defined(CONFIG_BRIDGE_EBT_IP6) || defined(CONFIG_BRIDGE_EBT_IP6_MODULE) | 110 | #if IS_ENABLED(CONFIG_BRIDGE_EBT_IP6) |
111 | if ((bitmask & EBT_LOG_IP6) && eth_hdr(skb)->h_proto == | 111 | if ((bitmask & EBT_LOG_IP6) && eth_hdr(skb)->h_proto == |
112 | htons(ETH_P_IPV6)) { | 112 | htons(ETH_P_IPV6)) { |
113 | const struct ipv6hdr *ih; | 113 | const struct ipv6hdr *ih; |