From: Vladimir Oltean <vladimir.oltean@nxp.com>
Date: Wed, 27 Oct 2021 16:21:15 +0000 (+0300)
Subject: net: bridge: provide shim definition for br_vlan_flags
X-Git-Tag: v5.16-rc1~159^2~37^2~4
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c5f6e5ebc2af65fc7d2e7c3a18446443afeca914;p=tomoyo%2Ftomoyo-test1.git

net: bridge: provide shim definition for br_vlan_flags

br_vlan_replay() needs this, and we're preparing to move it to
br_switchdev.c, which will be compiled regardless of whether or not
CONFIG_BRIDGE_VLAN_FILTERING is enabled.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 3c9327628060..cc31c3fe1e02 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -1708,6 +1708,11 @@ static inline bool br_vlan_can_enter_range(const struct net_bridge_vlan *v_curr,
 	return true;
 }
 
+static inline u16 br_vlan_flags(const struct net_bridge_vlan *v, u16 pvid)
+{
+	return 0;
+}
+
 static inline int br_vlan_replay(struct net_device *br_dev,
 				 struct net_device *dev, const void *ctx,
 				 bool adding, struct notifier_block *nb,