This is a note to let you know that I've just added the patch titled
net: dsa: b53: VLAN filtering is global to all users
to the 5.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-dsa-b53-vlan-filtering-is-global-to-all-users.patch
and it can be found in the queue-5.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From d45c36bafb94e72fdb6dee437279b61b6d97e706 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <f.fainelli@xxxxxxxxx>
Date: Wed, 10 Mar 2021 10:46:10 -0800
Subject: net: dsa: b53: VLAN filtering is global to all users
From: Florian Fainelli <f.fainelli@xxxxxxxxx>
commit d45c36bafb94e72fdb6dee437279b61b6d97e706 upstream.
The bcm_sf2 driver uses the b53 driver as a library but does not make
usre of the b53_setup() function, this made it fail to inherit the
vlan_filtering_is_global attribute. Fix this by moving the assignment to
b53_switch_alloc() which is used by bcm_sf2.
Fixes: 7228b23e68f7 ("net: dsa: b53: Let DSA handle mismatched VLAN filtering settings")
Signed-off-by: Florian Fainelli <f.fainelli@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/dsa/b53/b53_common.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -1070,13 +1070,6 @@ static int b53_setup(struct dsa_switch *
b53_disable_port(ds, port);
}
- /* Let DSA handle the case were multiple bridges span the same switch
- * device and different VLAN awareness settings are requested, which
- * would be breaking filtering semantics for any of the other bridge
- * devices. (not hardware supported)
- */
- ds->vlan_filtering_is_global = true;
-
return b53_setup_devlink_resources(ds);
}
@@ -2627,6 +2620,13 @@ struct b53_device *b53_switch_alloc(stru
ds->configure_vlan_while_not_filtering = true;
ds->untag_bridge_pvid = true;
dev->vlan_enabled = ds->configure_vlan_while_not_filtering;
+ /* Let DSA handle the case were multiple bridges span the same switch
+ * device and different VLAN awareness settings are requested, which
+ * would be breaking filtering semantics for any of the other bridge
+ * devices. (not hardware supported)
+ */
+ ds->vlan_filtering_is_global = true;
+
mutex_init(&dev->reg_mutex);
mutex_init(&dev->stats_mutex);
Patches currently in stable-queue which might be from f.fainelli@xxxxxxxxx are
queue-5.11/net-phy-broadcom-avoid-forward-for-bcm54xx_config_cl.patch
queue-5.11/net-dsa-bcm_sf2-qualify-phydev-dev_flags-based-on-po.patch
queue-5.11/net-phy-introduce-phydev-port.patch
queue-5.11/net-phy-broadcom-set-proper-1000basex-sgmii-interfac.patch
queue-5.11/net-dsa-b53-vlan-filtering-is-global-to-all-users.patch
queue-5.11/net-phy-broadcom-fix-rgmii-delays-for-bcm50160-and-b.patch
queue-5.11/net-phy-broadcom-add-power-down-exit-reset-state-del.patch
