aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/dsa
diff options
context:
space:
mode:
authorVivien Didelot <vivien.didelot@savoirfairelinux.com>2016-05-09 13:22:52 -0400
committerDavid S. Miller <davem@davemloft.net>2016-05-09 14:26:11 -0400
commit709643aa626ec8f0bd678be79187beefffae32c7 (patch)
tree3bc1ed9ccb13cd362f682615bce913316449c970 /drivers/net/dsa
parentnet: dsa: mv88e6xxx: factorize GLOBAL_CONTROL setup (diff)
downloadlinux-dev-709643aa626ec8f0bd678be79187beefffae32c7.tar.xz
linux-dev-709643aa626ec8f0bd678be79187beefffae32c7.zip
net: dsa: mv88e6131: drop VLAN Ethertype setup
The 6131 switch models have a Core Tag Type register. Their setup code is setting it to 0x8100, which is the reset default. Drop this specific part which is correctly configured on reset anyway. Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa')
-rw-r--r--drivers/net/dsa/mv88e6131.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/dsa/mv88e6131.c b/drivers/net/dsa/mv88e6131.c
index d05fc7980e0c..1c3b245cd110 100644
--- a/drivers/net/dsa/mv88e6131.c
+++ b/drivers/net/dsa/mv88e6131.c
@@ -65,11 +65,6 @@ static int mv88e6131_setup_global(struct dsa_switch *ds)
int ret;
u32 reg;
- /* Set the VLAN ethertype to 0x8100. */
- ret = mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_CORE_TAG_TYPE, 0x8100);
- if (ret)
- return ret;
-
/* Disable ARP mirroring, and configure the upstream port as
* the port to which ingress and egress monitor frames are to
* be sent.