From: Nikolay Aleksandrov <razor@blackwall.org>
Date: Mon, 20 Jul 2015 21:03:45 +0000 (+0200)
Subject: bridge: mcast: fix br_multicast_dev_del warn when igmp snooping is not defined
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a7ce45a74bedd0ed80b956b3e14f8bc6dec85327;p=linux-beck.git

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@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

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)
 {