Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b6e3d03 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

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: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a11485b7

drivers/net/dsa/mv88e6xxx/port.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -213,7 +213,7 @@ static int mv88e6xxx_port_set_speed(struct mv88e6xxx_chip *chip, int port, 
		reg &= ~PORT_PCS_CTRL_ALTSPEED;

		reg &= ~PORT_PCS_CTRL_ALTSPEED;

	if (force_bit) {

	if (force_bit) {

		reg &= ~PORT_PCS_CTRL_FORCE_SPEED;

		reg &= ~PORT_PCS_CTRL_FORCE_SPEED;

		if (speed)

		if (speed != SPEED_UNFORCED)

			ctrl |= PORT_PCS_CTRL_FORCE_SPEED;

			ctrl |= PORT_PCS_CTRL_FORCE_SPEED;

	}

	}

	reg |= ctrl;

	reg |= ctrl;