trix at redhat.com
2021-May-15 20:38 UTC
[Bridge] [PATCH] net: bridge: fix signature of stub br_multicast_is_router
From: Tom Rix <trix at redhat.com>
Building with CONFIG_IPV6 off causes this build error
br_input.c:135:8: error: too many arguments to function
?br_multicast_is_router?
br_multicast_is_router(br, skb)) {
^~~~~~~~~~~~~~~~~~~~~~
In file included from net/bridge/br_input.c:23:
net/bridge/br_private.h:1059:20: note: declared here
static inline bool br_multicast_is_router(struct net_bridge *br)
^~~~~~~~~~~~~~~~~~~~~~
Comparing the stub with the real function shows the stub needs
another parameter.
Signed-off-by: Tom Rix <trix at redhat.com>
---
net/bridge/br_private.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index f9a381fcff094..9fd54626ca809 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -1056,7 +1056,7 @@ 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.26.3
Randy Dunlap
2021-May-15 20:46 UTC
[Bridge] [PATCH] net: bridge: fix signature of stub br_multicast_is_router
On 5/15/21 1:38 PM, trix at redhat.com wrote:> From: Tom Rix <trix at redhat.com> > > Building with CONFIG_IPV6 off causes this build error > > br_input.c:135:8: error: too many arguments to function > ?br_multicast_is_router? > br_multicast_is_router(br, skb)) { > ^~~~~~~~~~~~~~~~~~~~~~ > In file included from net/bridge/br_input.c:23: > net/bridge/br_private.h:1059:20: note: declared here > static inline bool br_multicast_is_router(struct net_bridge *br) > ^~~~~~~~~~~~~~~~~~~~~~ > > Comparing the stub with the real function shows the stub needs > another parameter. > > Signed-off-by: Tom Rix <trix at redhat.com>Hi, A similar patch has already been merged: https://lore.kernel.org/netdev/20210514073233.2564187-1-razor at blackwall.org/> --- > net/bridge/br_private.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h > index f9a381fcff094..9fd54626ca809 100644 > --- a/net/bridge/br_private.h > +++ b/net/bridge/br_private.h > @@ -1056,7 +1056,7 @@ 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; > } >-- ~Randy