From 0b6e3d0322b39a5f3a974a0d3cb8677aeb8106a5 Mon Sep 17 00:00:00 2001 From: Andrew Lunn Date: Wed, 16 Nov 2016 04:26:48 +0100 Subject: [PATCH] net: dsa: mv88e6xxx: Respect SPEED_UNFORCED, don't set force bit The SPEED_UNFORCED indicates the MAC & PHY should perform auto-negotiation to determine a speed which works. If this is called for, don't set the force bit. If it is set, the MAC actually does 10Gbps, why the internal PHYs don't support. Signed-off-by: Andrew Lunn Signed-off-by: David S. Miller --- drivers/net/dsa/mv88e6xxx/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c index e4978f6367aa..af4772d86086 100644 --- a/drivers/net/dsa/mv88e6xxx/port.c +++ b/drivers/net/dsa/mv88e6xxx/port.c @@ -213,7 +213,7 @@ static int mv88e6xxx_port_set_speed(struct mv88e6xxx_chip *chip, int port, reg &= ~PORT_PCS_CTRL_ALTSPEED; if (force_bit) { reg &= ~PORT_PCS_CTRL_FORCE_SPEED; - if (speed) + if (speed != SPEED_UNFORCED) ctrl |= PORT_PCS_CTRL_FORCE_SPEED; } reg |= ctrl; -- 2.20.1