Commit 75518b0d authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: phylink: rearrange phylink_parse_mode() 



Of the two users of phylink_config->ovr_an_inband, both manually check
for a fixed link before setting this flag (or clearing it if they find
a fixed link.) This is unnecessary complication.

Rearrange phylink_parse_mode() a little so we can change how
phylink_config->ovr_an_inband works. This will allow the flag to be
tested before checking for the fixed link properties in the next patch.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarAndrew Halaney <ahalaney@redhat.com>
Link: https://lore.kernel.org/r/E1sCJMl-00Ecqp-K0@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2f19a795

drivers/net/phy/phylink.c

+4 −1
Original line number Diff line number Diff line
@@ -899,12 +899,15 @@ static int phylink_parse_mode(struct phylink *pl, 
			return -EINVAL;

		}



		pl->cfg_link_an_mode = MLO_AN_INBAND;

	}



	if (pl->cfg_link_an_mode == MLO_AN_INBAND) {

		linkmode_zero(pl->supported);

		phylink_set(pl->supported, MII);

		phylink_set(pl->supported, Autoneg);

		phylink_set(pl->supported, Asym_Pause);

		phylink_set(pl->supported, Pause);

		pl->cfg_link_an_mode = MLO_AN_INBAND;



		switch (pl->link_config.interface) {

		case PHY_INTERFACE_MODE_SGMII: