net: dsa: mv88e6xxx: do not change STP state on port disabling

When disabling a port, that is not for the driver to decide what to
do with the STP state. This is already handled by the DSA layer.

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

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 5e557545df6df05a4fc0176dcb291f724cc29fc9..27e1622bb03bd725c09c38506a1654bda71d9c2f 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -2291,9 +2291,6 @@ static void mv88e6xxx_port_disable(struct dsa_switch *ds, int port)
 
        mv88e6xxx_reg_lock(chip);
 
-       if (mv88e6xxx_port_set_state(chip, port, BR_STATE_DISABLED))
-               dev_err(chip->dev, "failed to disable port\n");
-
        if (chip->info->ops->serdes_irq_free)
                chip->info->ops->serdes_irq_free(chip, port);