From: Randy Dunlap <rdunlap@infradead.org>
To: trix@redhat.com, roopa@nvidia.com, nikolay@nvidia.com,
davem@davemloft.net, kuba@kernel.org
Cc: bridge@lists.linux-foundation.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] net: bridge: fix signature of stub br_multicast_is_router
Date: Sat, 15 May 2021 13:46:24 -0700 [thread overview]
Message-ID: <17c9c0cb-6f7a-20e7-62dd-9a2845e962ba@infradead.org> (raw)
In-Reply-To: <20210515203849.1756371-1-trix@redhat.com>
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
prev parent reply other threads:[~2021-05-15 20:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-15 20:38 [PATCH] net: bridge: fix signature of stub br_multicast_is_router trix
2021-05-15 20:46 ` Randy Dunlap [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=17c9c0cb-6f7a-20e7-62dd-9a2845e962ba@infradead.org \
--to=rdunlap@infradead.org \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nikolay@nvidia.com \
--cc=roopa@nvidia.com \
--cc=trix@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).