* [PATCH net-next] net: bridge: fix undefined br_vlan_can_enter_range in tunnel code
@ 2020-07-13 7:55 Nikolay Aleksandrov
2020-07-13 18:23 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Nikolay Aleksandrov @ 2020-07-13 7:55 UTC (permalink / raw)
To: netdev; +Cc: roopa, davem, Nikolay Aleksandrov, Stephen Rothwell
If bridge vlan filtering is not defined we won't have
br_vlan_can_enter_range and thus will get a compile error as was
reported by Stephen and the build bot. So let's define a stub for when
vlan filtering is not used.
Fixes: 94339443686b ("net: bridge: notify on vlan tunnel changes done via the old api")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
---
I mixed br_netlink_tunnel with br_vlan_tunnel where the former is always
compiled and the latter only with vlan filtering enabled.
net/bridge/br_private.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 65d2c163a24a..a0034400b762 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -1200,6 +1200,12 @@ static inline void br_vlan_notify(const struct net_bridge *br,
int cmd)
{
}
+
+static inline bool br_vlan_can_enter_range(const struct net_bridge_vlan *v_curr,
+ const struct net_bridge_vlan *range_end)
+{
+ return true;
+}
#endif
/* br_vlan_options.c */
--
2.25.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] net: bridge: fix undefined br_vlan_can_enter_range in tunnel code
2020-07-13 7:55 [PATCH net-next] net: bridge: fix undefined br_vlan_can_enter_range in tunnel code Nikolay Aleksandrov
@ 2020-07-13 18:23 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-07-13 18:23 UTC (permalink / raw)
To: nikolay; +Cc: netdev, roopa, sfr
From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Date: Mon, 13 Jul 2020 10:55:46 +0300
> If bridge vlan filtering is not defined we won't have
> br_vlan_can_enter_range and thus will get a compile error as was
> reported by Stephen and the build bot. So let's define a stub for when
> vlan filtering is not used.
>
> Fixes: 94339443686b ("net: bridge: notify on vlan tunnel changes done via the old api")
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Applied, thanks for fixing this.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-07-13 18:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-13 7:55 [PATCH net-next] net: bridge: fix undefined br_vlan_can_enter_range in tunnel code Nikolay Aleksandrov
2020-07-13 18:23 ` David Miller
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).