Re: [B.A.T.M.A.N.] [PATCH net-next 1/2] bridge: adding stubs for multicast exports

On Sun, Jul 6, 2014 at 8:41 PM, Linus Lüssing linus.luessing@web.de wrote:

diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index fd22789..e0c575c 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -36,8 +36,22 @@ extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __use

typedef int br_should_route_hook_t(struct sk_buff *skb); extern br_should_route_hook_t __rcu *br_should_route_hook;

+#if IS_ENABLED(CONFIG_BRIDGE) && IS_ENABLED(CONFIG_BRIDGE_IGMP_SNOOPING)

Nit: CONFIG_BRIDGE_IGMP_SNOOPING depends CONFIG_BRIDGE, so you can just check CONFIG_BRIDGE_IGMP_SNOOPING.