net: dsa: mv88e6131: use EDSA tag protocol

6131 is the only driver to set the tag protocol to DSA_TAG_PROTO_DSA.
Since it works fine with DSA_TAG_PROTO_EDSA, change its value, like all
other mv88e6xxx drivers.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig
index 4aaadced6b81f1659db1f1578690a79518adde83..7e01dce099041390f3ac3c53cffe3dfd07164451 100644 (file)
--- a/drivers/net/dsa/Kconfig
+++ b/drivers/net/dsa/Kconfig
@@ -17,7 +17,7 @@ config NET_DSA_MV88E6131
        tristate "Marvell 88E6085/6095/6095F/6131 ethernet switch chip support"
        depends on NET_DSA
        select NET_DSA_MV88E6XXX
-       select NET_DSA_TAG_DSA
+       select NET_DSA_TAG_EDSA
        ---help---
          This enables support for the Marvell 88E6085/6095/6095F/6131
          ethernet switch chips.

diff --git a/drivers/net/dsa/mv88e6131.c b/drivers/net/dsa/mv88e6131.c
index 22952be7f4de688c76adaa4acf26465e1bae933f..bbad199b50aa9874bd02d577591cbbd658650309 100644 (file)
--- a/drivers/net/dsa/mv88e6131.c
+++ b/drivers/net/dsa/mv88e6131.c
@@ -59,7 +59,7 @@ static const char *mv88e6131_drv_probe(struct device *dsa_dev,
 }
 
 struct dsa_switch_driver mv88e6131_switch_driver = {
-       .tag_protocol           = DSA_TAG_PROTO_DSA,
+       .tag_protocol           = DSA_TAG_PROTO_EDSA,
        .probe                  = mv88e6131_drv_probe,
        .setup                  = mv88e6xxx_setup,
        .set_addr               = mv88e6xxx_set_addr,