summaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorNikolay Aleksandrov <nikolay@cumulusnetworks.com>2020-07-13 10:55:46 +0300
committerDavid S. Miller <davem@davemloft.net>2020-07-13 11:22:55 -0700
commit528ae84a34ffd40da5d3fbff740d28d6dc2c8f8a (patch)
tree8ba6bfdc077197a31c1998fa58ecb88fd687f566 /net/bridge
parentc86768cf5cf6bfb2ce3742daaf09446465e96349 (diff)
downloadlinux-528ae84a34ffd40da5d3fbff740d28d6dc2c8f8a.tar.gz
linux-528ae84a34ffd40da5d3fbff740d28d6dc2c8f8a.tar.bz2
linux-528ae84a34ffd40da5d3fbff740d28d6dc2c8f8a.zip
net: bridge: fix undefined br_vlan_can_enter_range in tunnel code
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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_private.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index a6f348bea29a..baa1500f384f 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 */