net: dsa: mv88e6xxx: do not change STP state on port disabling
authorVivien Didelot <vivien.didelot@gmail.com>
Mon, 19 Aug 2019 20:00:51 +0000 (16:00 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 20 Aug 2019 19:33:49 +0000 (12:33 -0700)
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>
drivers/net/dsa/mv88e6xxx/chip.c

index 5e55754..27e1622 100644 (file)
@@ -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);