From: Vivien Didelot Date: Mon, 19 Aug 2019 20:00:51 +0000 (-0400) Subject: net: dsa: mv88e6xxx: do not change STP state on port disabling X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3903f315165dff72796e46d177aaf1cbd67aa07d;p=linux.git 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 Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller --- diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 5e557545df6df..27e1622bb03bd 100644 --- 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);