Linux Ethernet Bridging - Jul 2015 - [Bridge] [PATCH net-next] bridge: mcast: fix br_multicast_dev_del warn when igmp snooping is not defined

Fix:
net/bridge/br_if.c: In function 'br_dev_delete':
>> net/bridge/br_if.c:284:2: error: implicit declaration of function
>> 'br_multicast_dev_del' [-Werror=implicit-function-declaration]
     br_multicast_dev_del(br);
     ^
   cc1: some warnings being treated as errors

when igmp snooping is not defined.

Signed-off-by: Nikolay Aleksandrov <nikolay at cumulusnetworks.com>
---
Apologies for the mess.

 net/bridge/br_private.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 2bada2279721..3ad1290528af 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -566,6 +566,10 @@ static inline void br_multicast_stop(struct net_bridge *br)
 {
 }
 
+static inline void br_multicast_dev_del(struct net_bridge *br)
+{
+}
+
 static inline void br_multicast_deliver(struct net_bridge_mdb_entry *mdst,
 					struct sk_buff *skb)
 {
-- 
1.9.3

From: Nikolay Aleksandrov <razor at blackwall.org>
Date: Mon, 20 Jul 2015 23:03:45 +0200
> Fix:
> net/bridge/br_if.c: In function 'br_dev_delete':
>>> net/bridge/br_if.c:284:2: error: implicit declaration of function
>>> 'br_multicast_dev_del'
[-Werror=implicit-function-declaration]
>      br_multicast_dev_del(br);
>      ^
>    cc1: some warnings being treated as errors
> 
> when igmp snooping is not defined.
> 
> Signed-off-by: Nikolay Aleksandrov <nikolay at cumulusnetworks.com>
> ---
> Apologies for the mess.
Applied, thanks.