net: dsa: mt7530: fix VLAN setup
Subsystems (5)
PATCH 1/1 net: dsa: mt7530: fix VLAN setup
Allow DSA to add VLAN entries even if VLAN filtering is disabled, so enabling it will not block the traffic of existent ports in the bridge
Signed-off-by DENG Qingfang <[email protected]>
--- drivers/net/dsa/mt7530.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
drivers/net/dsa/mt7530.c +1 -12
@@ -1085,12 +1085,6 @@ mt7530_port_vlan_add(struct dsa_switch *ds, int port,struct mt7530_priv *priv = ds->priv;u16 vid; -/* The port is kept as VLAN-unaware if bridge with vlan_filtering not -* being set. -*/ -if (!dsa_port_is_vlan_filtering (dsa_to_port (ds, port))) -return ; -mutex_lock (&priv->reg_mutex);for (vid = vlan->vid_begin; vid <= vlan->vid_end; ++vid) {
@@ -1116,12 +1110,6 @@ mt7530_port_vlan_del(struct dsa_switch *ds, int port,struct mt7530_priv *priv = ds->priv;u16 vid, pvid; -/* The port is kept as VLAN-unaware if bridge with vlan_filtering not -* being set. -*/ -if (!dsa_port_is_vlan_filtering (dsa_to_port (ds, port))) -return 0 ; -mutex_lock (&priv->reg_mutex); pvid = priv->ports[port].pvid;
@@ -1235,6 +1223,7 @@ mt7530_setup(struct dsa_switch *ds)* as two netdev instances. */ dn =dsa_to_port (ds,MT7530_CPU_PORT )->master->dev.of_node->parent; + ds->configure_vlan_while_not_filtering = true;if (priv->id ==ID_MT7530 ) {regulator_set_voltage (priv->core_pwr,1000000 ,1000000 );
Signature · 1 line
2.26.2
Quoted 4 lines · DENG Qingfang
Allow DSA to add VLAN entries even if VLAN filtering is disabled, so enabling it will not block the traffic of existent ports in the bridge
Signed-off-by DENG Qingfang <[email protected]>
Reviewed-by Florian Fainelli <[email protected]>
Signature · 1 line
Florian
From: DENG Qingfang <[email protected]>
Date: Fri, 15 May 2020 23:25:55 +0800
Quoted 4 lines
Allow DSA to add VLAN entries even if VLAN filtering is disabled, so enabling it will not block the traffic of existent ports in the bridge
Signed-off-by DENG Qingfang <[email protected]>
Applied, thank you.