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 <dqfext@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index a063d914c23f5ea6a280c684026af509405b7538..d30542fc556a7c6322e796f807fae710abc82c0e 100644 (file)
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -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);