[PATCH RFC v2 net-next 04/14] bridge: br_vlan_fill_forward_path_pvid: Add port to port

[Eric Woudstra]

Lookup vlan group from bridge port, if it is passed as argument.

Signed-off-by: Eric Woudstra <ericwo...@gmail.com>
---
 net/bridge/br_private.h | 2 ++
 net/bridge/br_vlan.c    | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 9853cfbb9d14..046d7b04771f 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -1581,6 +1581,7 @@ bool br_vlan_can_enter_range(const struct net_bridge_vlan 
*v_curr,
                             const struct net_bridge_vlan *range_end);
 
 void br_vlan_fill_forward_path_pvid(struct net_bridge *br,
+                                   struct net_bridge_port *p,
                                    struct net_device_path_ctx *ctx,
                                    struct net_device_path *path);
 int br_vlan_fill_forward_path_mode(struct net_bridge *br,
@@ -1750,6 +1751,7 @@ static inline int nbp_get_num_vlan_infos(struct 
net_bridge_port *p,
 }
 
 static inline void br_vlan_fill_forward_path_pvid(struct net_bridge *br,
+                                                 struct net_bridge_port *p,
                                                  struct net_device_path_ctx 
*ctx,
                                                  struct net_device_path *path)
 {
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 89f51ea4cabe..2ea1e2ff4676 100644
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -1441,6 +1441,7 @@ int br_vlan_get_pvid_rcu(const struct net_device *dev, 
u16 *p_pvid)
 EXPORT_SYMBOL_GPL(br_vlan_get_pvid_rcu);
 
 void br_vlan_fill_forward_path_pvid(struct net_bridge *br,
+                                   struct net_bridge_port *p,
                                    struct net_device_path_ctx *ctx,
                                    struct net_device_path *path)
 {
@@ -1453,7 +1454,10 @@ void br_vlan_fill_forward_path_pvid(struct net_bridge 
*br,
        if (!br_opt_get(br, BROPT_VLAN_ENABLED))
                return;
 
-       vg = br_vlan_group(br);
+       if (p)
+               vg = nbp_vlan_group(p);
+       else
+               vg = br_vlan_group(br);
 
        if (idx >= 0 &&
            ctx->vlan[idx].proto == br->vlan_proto) {
-- 
2.45.2