[PATCH net-next] net: bridge: fix br_multicast_is_router stub when igmp is disabled

From: Nikolay Aleksandrov <redacted>

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 <redacted>
---
 net/bridge/br_private.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 53cace4d9487..28f91b111085 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h

@@ -1081,7 +1081,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;
 }

-- 
2.30.2

On Fri, May 14, 2021 at 10:32:33AM +0300, Nikolay Aleksandrov wrote:

Acked-by: Linus Lüssing <redacted>

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

On Fri, 14 May 2021 10:32:33 +0300 you wrote:

From: Nikolay Aleksandrov <redacted>

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 <redacted>

[...]

Here is the summary with links:
  - [net-next] net: bridge: fix br_multicast_is_router stub when igmp is disabled
    https://git.kernel.org/netdev/net-next/c/bbc6f2cca74e

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html