net: dsa: mv88e6xxx: Only support EDSA tagging

The merged driver no longer offers the option to use DSA tagging. So
remove the code to setup the switch to do DSA tagging and hard code
the use of EDSA.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>y
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
index 492801a..11845ec 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx.c
+++ b/drivers/net/dsa/mv88e6xxx.c
@@ -2725,11 +2725,8 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_priv_state *ps, int port)
                if (mv88e6xxx_6352_family(ps) || mv88e6xxx_6351_family(ps) ||
                    mv88e6xxx_6165_family(ps) || mv88e6xxx_6097_family(ps) ||
                    mv88e6xxx_6320_family(ps)) {
-                       if (ds->dst->tag_protocol == DSA_TAG_PROTO_EDSA)
-                               reg |= PORT_CONTROL_FRAME_ETHER_TYPE_DSA;
-                       else
-                               reg |= PORT_CONTROL_FRAME_MODE_DSA;
-                       reg |= PORT_CONTROL_FORWARD_UNKNOWN |
+                       reg |= PORT_CONTROL_FRAME_ETHER_TYPE_DSA |
+                               PORT_CONTROL_FORWARD_UNKNOWN |
                                PORT_CONTROL_FORWARD_UNKNOWN_MC;
                }
 
@@ -2737,7 +2734,6 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_priv_state *ps, int port)
                    mv88e6xxx_6165_family(ps) || mv88e6xxx_6097_family(ps) ||
                    mv88e6xxx_6095_family(ps) || mv88e6xxx_6065_family(ps) ||
                    mv88e6xxx_6185_family(ps) || mv88e6xxx_6320_family(ps)) {
-                       if (ds->dst->tag_protocol == DSA_TAG_PROTO_EDSA)
                                reg |= PORT_CONTROL_EGRESS_ADD_TAG;
                }
        }