| Message ID | 20210514073233.2564187-1-razor@blackwall.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | bbc6f2cca74e548914a7705f5c39549c28ab8815 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: bridge: fix br_multicast_is_router stub when igmp is disabled | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 2 maintainers not CCed: bridge@lists.linux-foundation.org kuba@kernel.org |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 3 this patch: 3 |
| netdev/kdoc | success | Errors and warnings before: 3 this patch: 3 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 9 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 3 this patch: 3 |
| netdev/header_inline | success | Link |
On Fri, May 14, 2021 at 10:32:33AM +0300, Nikolay Aleksandrov wrote: > From: Nikolay Aleksandrov <nikolay@nvidia.com> > > 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> > --- > 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 > Acked-by: Linus Lüssing <linus.luessing@c0d3.blue>
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 <nikolay@nvidia.com> > > 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> > > [...] 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
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; }