| Message ID | 20241013185509.4430-5-ericwouds@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | bridge-fastpath and related improvements | expand |
On 13/10/2024 21:55, Eric Woudstra wrote: > Lookup vlan group from bridge port, if it is passed as argument. > > Signed-off-by: Eric Woudstra <ericwouds@gmail.com> > --- > net/bridge/br_private.h | 1 + > net/bridge/br_vlan.c | 6 +++++- > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h > index d4bedc87b1d8..8da7798f9368 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, You haven't updated the !CONFIG_BRIDGE_VLAN_FILTERING version of this helper. > diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c > index 9c2fffb827ab..1830d7d617cd 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) {
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index d4bedc87b1d8..8da7798f9368 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, diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index 9c2fffb827ab..1830d7d617cd 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) {
Lookup vlan group from bridge port, if it is passed as argument. Signed-off-by: Eric Woudstra <ericwouds@gmail.com> --- net/bridge/br_private.h | 1 + net/bridge/br_vlan.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-)