Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6373c4c authored by Igor Maravić's avatar Igor Maravić Committed by David S. Miller
Browse files

net:bridge: use IS_ENABLED 



Use IS_ENABLED(CONFIG_FOO)
instead of defined(CONFIG_FOO) || defined (CONFIG_FOO_MODULE)

Signed-off-by: default avatarIgor Maravić <igorm@etf.rs>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c0cd1156

net/bridge/br.c

+2 −2
Original line number Diff line number Diff line
@@ -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

net/bridge/br_fdb.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ struct net_bridge_fdb_entry *__br_fdb_get(struct net_bridge *br, 
	return NULL;

}



#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)

#if IS_ENABLED(CONFIG_ATM_LANE)

/* Interface used by ATM LANE hook to test

 * if an addr is on some other bridge port */

int br_fdb_test_addr(struct net_device *dev, unsigned char *addr)

net/bridge/br_netfilter.c

+1 −1
Original line number Diff line number Diff line
@@ -807,7 +807,7 @@ static unsigned int br_nf_forward_arp(unsigned int hook, struct sk_buff *skb, 
	return NF_STOLEN;

}



#if defined(CONFIG_NF_CONNTRACK_IPV4) || defined(CONFIG_NF_CONNTRACK_IPV4_MODULE)

#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV4)

static int br_nf_dev_queue_xmit(struct sk_buff *skb)

{

	int ret;

net/bridge/br_private.h

+1 −1
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ extern void br_stp_port_timer_init(struct net_bridge_port *p); 
extern unsigned long br_timer_value(const struct timer_list *timer);



/* br.c */

#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)

#if IS_ENABLED(CONFIG_ATM_LANE)

extern int (*br_fdb_test_addr_hook)(struct net_device *dev, unsigned char *addr);

#endif

net/bridge/netfilter/ebt_log.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ ebt_log_packet(u_int8_t pf, unsigned int hooknum, 
		goto out;

	}



#if defined(CONFIG_BRIDGE_EBT_IP6) || defined(CONFIG_BRIDGE_EBT_IP6_MODULE)

#if IS_ENABLED(CONFIG_BRIDGE_EBT_IP6)

	if ((bitmask & EBT_LOG_IP6) && eth_hdr(skb)->h_proto ==

	   htons(ETH_P_IPV6)) {

		const struct ipv6hdr *ih;