* [PATCH net-next] net: dsa: mt7530: fix VLAN setup
@ 2020-05-15 15:25 DENG Qingfang
2020-05-15 15:46 ` Florian Fainelli
2020-05-15 17:32 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: DENG Qingfang @ 2020-05-15 15:25 UTC (permalink / raw)
To: netdev
Cc: Sean Wang, Andrew Lunn, Vivien Didelot, Florian Fainelli,
David S . Miller, linux-mediatek, Russell King, Matthias Brugger,
René van Dorst, Tom James, Stijn Segers, riddlariddla,
Szabolcs Hubai, Paul Fertser
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>
---
drivers/net/dsa/mt7530.c | 13 +------------
1 file changed, 1 insertion(+), 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);
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net-next] net: dsa: mt7530: fix VLAN setup
2020-05-15 15:25 [PATCH net-next] net: dsa: mt7530: fix VLAN setup DENG Qingfang
@ 2020-05-15 15:46 ` Florian Fainelli
2020-05-15 17:32 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Florian Fainelli @ 2020-05-15 15:46 UTC (permalink / raw)
To: DENG Qingfang, netdev
Cc: Sean Wang, Andrew Lunn, Vivien Didelot, David S . Miller,
linux-mediatek, Russell King, Matthias Brugger,
René van Dorst, Tom James, Stijn Segers, riddlariddla,
Szabolcs Hubai, Paul Fertser
On 5/15/2020 8:25 AM, DENG Qingfang wrote:
> 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>
--
Florian
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] net: dsa: mt7530: fix VLAN setup
2020-05-15 15:25 [PATCH net-next] net: dsa: mt7530: fix VLAN setup DENG Qingfang
2020-05-15 15:46 ` Florian Fainelli
@ 2020-05-15 17:32 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2020-05-15 17:32 UTC (permalink / raw)
To: dqfext
Cc: netdev, sean.wang, andrew, vivien.didelot, f.fainelli,
linux-mediatek, linux, matthias.bgg, opensource, tj17, foss,
riddlariddla, szab.hu, fercerpav
From: DENG Qingfang <dqfext@gmail.com>
Date: Fri, 15 May 2020 23:25:55 +0800
> 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>
Applied, thank you.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-15 17:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-15 15:25 [PATCH net-next] net: dsa: mt7530: fix VLAN setup DENG Qingfang
2020-05-15 15:46 ` Florian Fainelli
2020-05-15 17:32 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).