diff options
| author | DENG Qingfang <dqfext@gmail.com> | 2020-05-15 17:25:55 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-15 19:42:58 +0200 |
| commit | 0141792f8b7300006b874dda1c35acd0abd90d9d (patch) | |
| tree | cf2d126d4b905b9bca4921bcbcaa3b1ed0f90bfa /drivers/net | |
| parent | Merge branch 'Implement-classifier-action-terse-dump-mode' (diff) | |
| download | linux-0141792f8b7300006b874dda1c35acd0abd90d9d.tar.xz linux-0141792f8b7300006b874dda1c35acd0abd90d9d.zip | |
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/dsa/mt7530.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index a063d914c23f..d30542fc556a 100644 --- 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); |