From: Vivien Didelot Date: Mon, 9 May 2016 17:22:52 +0000 (-0400) Subject: net: dsa: mv88e6131: drop VLAN Ethertype setup X-Git-Tag: v4.7-rc1~154^2~88^2~6 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=709643aa626ec8f0bd678be79187beefffae32c7;p=cascardo%2Flinux.git 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 Signed-off-by: David S. Miller --- 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.