aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVivien Didelot <vivien.didelot@savoirfairelinux.com>2016-05-09 13:22:57 -0400
committerDavid S. Miller <davem@davemloft.net>2016-05-09 14:26:13 -0400
commitb9729e53ade9be2637b46ac98fd85c7eac1b77c8 (patch)
tree247a61cf9be11dd66784cfcd6d933d58d73ec127
parenta1a6a4d1f76aab009e6e0b1003b9c7bca3991e9c (diff)
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>
-rw-r--r--drivers/net/dsa/Kconfig2
-rw-r--r--drivers/net/dsa/mv88e6131.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig
index 4aaadced6b81..7e01dce09904 100644
--- a/drivers/net/dsa/Kconfig
+++ b/drivers/net/dsa/Kconfig
@@ -17,7 +17,7 @@ config NET_DSA_MV88E6131
17 tristate "Marvell 88E6085/6095/6095F/6131 ethernet switch chip support" 17 tristate "Marvell 88E6085/6095/6095F/6131 ethernet switch chip support"
18 depends on NET_DSA 18 depends on NET_DSA
19 select NET_DSA_MV88E6XXX 19 select NET_DSA_MV88E6XXX
20 select NET_DSA_TAG_DSA 20 select NET_DSA_TAG_EDSA
21 ---help--- 21 ---help---
22 This enables support for the Marvell 88E6085/6095/6095F/6131 22 This enables support for the Marvell 88E6085/6095/6095F/6131
23 ethernet switch chips. 23 ethernet switch chips.
diff --git a/drivers/net/dsa/mv88e6131.c b/drivers/net/dsa/mv88e6131.c
index 22952be7f4de..bbad199b50aa 100644
--- 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,
59} 59}
60 60
61struct dsa_switch_driver mv88e6131_switch_driver = { 61struct dsa_switch_driver mv88e6131_switch_driver = {
62 .tag_protocol = DSA_TAG_PROTO_DSA, 62 .tag_protocol = DSA_TAG_PROTO_EDSA,
63 .probe = mv88e6131_drv_probe, 63 .probe = mv88e6131_drv_probe,
64 .setup = mv88e6xxx_setup, 64 .setup = mv88e6xxx_setup,
65 .set_addr = mv88e6xxx_set_addr, 65 .set_addr = mv88e6xxx_set_addr,