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

net: phylink: move manual flow control setting 



Move the handling of manual flow control configuration to a common
location during resolve. We currently evaluate this for all but
fixed links.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1t9RQe-002Feh-T1@rmk-PC.armlinux.org.uk


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

drivers/net/phy/phylink.c

+3 −2
Original line number Diff line number Diff line
@@ -1467,7 +1467,6 @@ static void phylink_resolve(struct work_struct *w) 
		switch (pl->cur_link_an_mode) {

		case MLO_AN_PHY:

			link_state = pl->phy_state;

			phylink_apply_manual_flow(pl, &link_state);

			mac_config = link_state.link;

			break;
@@ -1528,11 +1527,13 @@ static void phylink_resolve(struct work_struct *w) 
				link_state.pause = pl->phy_state.pause;

				mac_config = true;

			}

			phylink_apply_manual_flow(pl, &link_state);

			break;

		}

	}



	if (pl->cur_link_an_mode != MLO_AN_FIXED)

		phylink_apply_manual_flow(pl, &link_state);



	if (mac_config) {

		if (link_state.interface != pl->link_config.interface) {

			/* The interface has changed, force the link down and