net: dsa: felix: delete workarounds present due to SVL tag_8021q bridging

The felix driver, which also has a tagging protocol implementation based
on tag_8021q, does not care about adding the RX VLAN that is pvid on one
port on the other ports that are in the same bridge with it. It simply
doesn't need that, because in its implementation, the RX VLAN that is
pvid of a port is only used to install a TCAM rule that pushes that VLAN
ID towards the CPU port.

Now that tag_8021q no longer performs Shared VLAN Learning based
forwarding, the RX VLANs are actually segregated into two types:
standalone VLANs and VLAN-unaware bridging VLANs. Since you actually
have to call dsa_tag_8021q_bridge_join() to get a bridging VLAN from
tag_8021q, and felix does not do that because it doesn't need it, it
means that it only gets standalone port VLANs from tag_8021q. Which is
perfect because this means it can drop its workarounds that avoid the
VLANs it does not need.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
index 1d7c5d7970bd2a2bab49e257048f92e580b9e75c..57d6e62d7a48c98ac9135378606c3cbbcabf147f 100644 (file)
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -33,13 +33,6 @@ static int felix_tag_8021q_rxvlan_add(struct felix *felix, int port, u16 vid,
        struct dsa_switch *ds = felix->ds;
        int key_length, upstream, err;
 
-       /* We don't need to install the rxvlan into the other ports' filtering
-        * tables, because we're just pushing the rxvlan when sending towards
-        * the CPU
-        */
-       if (!pvid)
-               return 0;
-
        key_length = ocelot->vcap[VCAP_ES0].keys[VCAP_ES0_IGR_PORT].length;
        upstream = dsa_upstream_port(ds, port);
 
@@ -170,16 +163,8 @@ static int felix_tag_8021q_rxvlan_del(struct felix *felix, int port, u16 vid)
 
        outer_tagging_rule = ocelot_vcap_block_find_filter_by_id(block_vcap_es0,
                                                                 port, false);
-       /* In rxvlan_add, we had the "if (!pvid) return 0" logic to avoid
-        * installing outer tagging ES0 rules where they weren't needed.
-        * But in rxvlan_del, the API doesn't give us the "flags" anymore,
-        * so that forces us to be slightly sloppy here, and just assume that
-        * if we didn't find an outer_tagging_rule it means that there was
-        * none in the first place, i.e. rxvlan_del is called on a non-pvid
-        * port. This is most probably true though.
-        */
        if (!outer_tagging_rule)
-               return 0;
+               return -ENOENT;
 
        return ocelot_vcap_filter_del(ocelot, outer_tagging_rule);
 }
@@ -201,7 +186,7 @@ static int felix_tag_8021q_txvlan_del(struct felix *felix, int port, u16 vid)
        untagging_rule = ocelot_vcap_block_find_filter_by_id(block_vcap_is1,
                                                             port, false);
        if (!untagging_rule)
-               return 0;
+               return -ENOENT;
 
        err = ocelot_vcap_filter_del(ocelot, untagging_rule);
        if (err)