net: dsa: program VLAN on CPU port from slave

[linux.git] / net / dsa / switch.c

diff --git a/net/dsa/switch.c b/net/dsa/switch.c
index 489eb7b430a4948e7adb65b94e0d27732ff406b1..6a96075188234ab0c709aaa759f6147d90c2d188 100644 (file)
--- a/net/dsa/switch.c
+++ b/net/dsa/switch.c
@@ -232,7 +232,7 @@ static bool dsa_switch_vlan_match(struct dsa_switch *ds, int port,
        if (ds->index == info->sw_index && port == info->port)
                return true;
 
-       if (dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port))
+       if (dsa_is_dsa_port(ds, port))
                return true;
 
        return false;
@@ -288,6 +288,9 @@ static int dsa_switch_vlan_del(struct dsa_switch *ds,
        if (ds->index == info->sw_index)
                return ds->ops->port_vlan_del(ds, info->port, info->vlan);
 
+       /* Do not deprogram the DSA links as they may be used as conduit
+        * for other VLAN members in the fabric.
+        */
        return 0;
 }