From: Nikolay Aleksandrov <nikolay@nvidia.com>
Date: Fri, 14 May 2021 07:32:33 +0000 (+0300)
Subject: net: bridge: fix br_multicast_is_router stub when igmp is disabled
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bbc6f2cca74e548914a7705f5c39549c28ab8815;p=linux.git

net: bridge: fix br_multicast_is_router stub when igmp is disabled

br_multicast_is_router takes two arguments when bridge IGMP is enabled
and just one when it's disabled, fix the stub to take two as well.

Fixes: 1a3065a26807 ("net: bridge: mcast: prepare is-router function for mcast router split")
Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Acked-by: Linus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 03197ab4af76a..ec661130c2d07 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -1068,7 +1068,8 @@ static inline void br_multicast_flood(struct net_bridge_mdb_entry *mdst,
 {
 }
 
-static inline bool br_multicast_is_router(struct net_bridge *br)
+static inline bool br_multicast_is_router(struct net_bridge *br,
+					  struct sk_buff *skb)
 {
 	return false;
 }