|
@@ -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 */
|
|
/* This hook is defined here for ATM LANE */
|
|
int (*br_fdb_test_addr_hook)(struct net_device *dev,
|
|
int (*br_fdb_test_addr_hook)(struct net_device *dev,
|
|
unsigned char *addr) __read_mostly;
|
|
unsigned char *addr) __read_mostly;
|