| Message ID | 20200713075546.1147199-1-nikolay@cumulusnetworks.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] net: bridge: fix undefined br_vlan_can_enter_range in tunnel code | expand |
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.
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 */
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(+)