Commit e3ee07d1 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: dsa: mt7530: Let DSA handle the unsetting of vlan_filtering 



The driver, recognizing that the .port_vlan_filtering callback was never
coming after the port left its parent bridge, decided to take that duty
in its own hands. DSA now takes care of this condition, so fix that.

Signed-off-by: default avatarVladimir Oltean <olteanv@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d371b7c9

drivers/net/dsa/mt7530.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -910,8 +910,6 @@ mt7530_port_bridge_leave(struct dsa_switch *ds, int port, 
			   PCR_MATRIX(BIT(MT7530_CPU_PORT)));

			   PCR_MATRIX(BIT(MT7530_CPU_PORT)));

	priv->ports[port].pm = PCR_MATRIX(BIT(MT7530_CPU_PORT));

	priv->ports[port].pm = PCR_MATRIX(BIT(MT7530_CPU_PORT));





	mt7530_port_set_vlan_unaware(ds, port);



	mutex_unlock(&priv->reg_mutex);

	mutex_unlock(&priv->reg_mutex);

}

}
@@ -1025,6 +1023,8 @@ mt7530_port_vlan_filtering(struct dsa_switch *ds, int port, 
		 */

		 */

		mt7530_port_set_vlan_aware(ds, port);

		mt7530_port_set_vlan_aware(ds, port);

		mt7530_port_set_vlan_aware(ds, MT7530_CPU_PORT);

		mt7530_port_set_vlan_aware(ds, MT7530_CPU_PORT);

	} else {

		mt7530_port_set_vlan_unaware(ds, port);

	}

	}





	return 0;

	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE