* [PATCH] net: bridge: fix signature of stub br_multicast_is_router
@ 2021-05-15 20:38 ` trix
0 siblings, 0 replies; 4+ messages in thread
From: trix @ 2021-05-15 20:38 UTC (permalink / raw)
To: roopa, nikolay, davem, kuba; +Cc: bridge, netdev, linux-kernel, Tom Rix
From: Tom Rix <trix@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@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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Bridge] [PATCH] net: bridge: fix signature of stub br_multicast_is_router
@ 2021-05-15 20:38 ` trix
0 siblings, 0 replies; 4+ messages in thread
From: trix @ 2021-05-15 20:38 UTC (permalink / raw)
To: roopa, nikolay, davem, kuba; +Cc: netdev, bridge, linux-kernel, Tom Rix
From: Tom Rix <trix@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@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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] net: bridge: fix signature of stub br_multicast_is_router
2021-05-15 20:38 ` [Bridge] " trix
@ 2021-05-15 20:46 ` Randy Dunlap
-1 siblings, 0 replies; 4+ messages in thread
From: Randy Dunlap @ 2021-05-15 20:46 UTC (permalink / raw)
To: trix, roopa, nikolay, davem, kuba; +Cc: bridge, netdev, linux-kernel
On 5/15/21 1:38 PM, trix@redhat.com wrote:
> From: Tom Rix <trix@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@redhat.com>
Hi,
A similar patch has already been merged:
https://lore.kernel.org/netdev/20210514073233.2564187-1-razor@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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Bridge] [PATCH] net: bridge: fix signature of stub br_multicast_is_router
@ 2021-05-15 20:46 ` Randy Dunlap
0 siblings, 0 replies; 4+ messages in thread
From: Randy Dunlap @ 2021-05-15 20:46 UTC (permalink / raw)
To: trix, roopa, nikolay, davem, kuba; +Cc: netdev, bridge, linux-kernel
On 5/15/21 1:38 PM, trix@redhat.com wrote:
> From: Tom Rix <trix@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@redhat.com>
Hi,
A similar patch has already been merged:
https://lore.kernel.org/netdev/20210514073233.2564187-1-razor@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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-05-15 20:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-15 20:38 [PATCH] net: bridge: fix signature of stub br_multicast_is_router trix
2021-05-15 20:38 ` [Bridge] " trix
2021-05-15 20:46 ` Randy Dunlap
2021-05-15 20:46 ` [Bridge] " Randy Dunlap
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.