Commit 49a2f5c8 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'fix-2-dsa-issues-with-vlan_filtering_is_global' 

Vladimir Oltean says:

====================
Fix 2 DSA issues with vlan_filtering_is_global

This patch set fixes 2 issues with vlan_filtering_is_global switches.

Both are regressions introduced by refactoring commit d0004a02
("net: dsa: remove the "dsa_to_port in a loop" antipattern from the
core"), which wasn't tested on a wide enough variety of switches.

Tested on the sja1105 driver.
====================

Link: https://lore.kernel.org/r/20220715151659.780544-1-vladimir.oltean@nxp.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 1e53834c 1699b4d5

net/dsa/port.c

+4 −3
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ static void dsa_port_reset_vlan_filtering(struct dsa_port *dp, 
	struct netlink_ext_ack extack = {0};

	bool change_vlan_filtering = false;

	struct dsa_switch *ds = dp->ds;

	struct dsa_port *other_dp;

	bool vlan_filtering;

	int err;
@@ -270,8 +271,8 @@ static void dsa_port_reset_vlan_filtering(struct dsa_port *dp, 
	 * VLAN-aware bridge.

	 */

	if (change_vlan_filtering && ds->vlan_filtering_is_global) {

		dsa_switch_for_each_port(dp, ds) {

			struct net_device *br = dsa_port_bridge_dev_get(dp);

		dsa_switch_for_each_port(other_dp, ds) {

			struct net_device *br = dsa_port_bridge_dev_get(other_dp);



			if (br && br_vlan_enabled(br)) {

				change_vlan_filtering = false;
@@ -799,7 +800,7 @@ int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering, 
		ds->vlan_filtering = vlan_filtering;



		dsa_switch_for_each_user_port(other_dp, ds) {

			struct net_device *slave = dp->slave;

			struct net_device *slave = other_dp->slave;



			/* We might be called in the unbind path, so not

			 * all slave devices might still be registered.