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

net: phylink: move test for ovr_an_inband 



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.

Test ovr_an_inband before checking for the fixed-link properties, which
will allow ovr_an_inband to be overriden by a fixed link specification.

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/E1sCJMq-00Ecqv-P8@rmk-PC.armlinux.org.uk


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

drivers/net/phy/phylink.c

+4 −2
Original line number Diff line number Diff line
@@ -885,14 +885,16 @@ static int phylink_parse_mode(struct phylink *pl, 
	const char *managed;

	unsigned long caps;



	if (pl->config->ovr_an_inband)

		pl->cfg_link_an_mode = MLO_AN_INBAND;



	dn = fwnode_get_named_child_node(fwnode, "fixed-link");

	if (dn || fwnode_property_present(fwnode, "fixed-link"))

		pl->cfg_link_an_mode = MLO_AN_FIXED;

	fwnode_handle_put(dn);



	if ((fwnode_property_read_string(fwnode, "managed", &managed) == 0 &&

	     strcmp(managed, "in-band-status") == 0) ||

	    pl->config->ovr_an_inband) {

	     strcmp(managed, "in-band-status") == 0)) {

		if (pl->cfg_link_an_mode == MLO_AN_FIXED) {

			phylink_err(pl,

				    "can't use both fixed-link and in-band-status\n");