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

Commit 15b08daa authored by Antoine Tenart's avatar Antoine Tenart Committed by Greg Kroah-Hartman
Browse files

net: phy: phylink: ensure the carrier is off when starting phylink 



[ Upstream commit aeeb2e8fdefdd5d257a1446351c70cb3df540199 ]

Phylink made an assumption about the carrier state being down when
calling phylink_start(). If this assumption isn't satisfied, the
internal phylink state could misbehave and a net device could end up not
being functional.

This patch fixes this by explicitly calling netif_carrier_off() in
phylink_start().

Signed-off-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f9573e11

drivers/net/phy/phylink.c

+3 −0
Original line number Diff line number Diff line
@@ -907,6 +907,9 @@ void phylink_start(struct phylink *pl) 
		    phylink_an_mode_str(pl->link_an_mode),

		    phy_modes(pl->link_config.interface));



	/* Always set the carrier off */

	netif_carrier_off(pl->netdev);



	/* Apply the link configuration to the MAC when starting. This allows

	 * a fixed-link to start with the correct parameters, and also

	 * ensures that we set the appropriate advertisement for Serdes links.