diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-04-22 17:24:46 +0100 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-05-07 10:49:43 +0100 |
| commit | 25bf06b06f9a8b9df272d74d3184d2d99e37c9b5 (patch) | |
| tree | ec7c3aae0dfb486e8f4b63c4ebb381313010d0f3 /drivers/net/phy/phylink.c | |
| parent | 02a4fbff633768053e9296002739bb05107165de (diff) | |
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: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'drivers/net/phy/phylink.c')
| -rw-r--r-- | drivers/net/phy/phylink.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 65c597fef751..88f8505ef230 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -1713,7 +1713,6 @@ static void phylink_resolve(struct work_struct *w) switch (pl->act_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; @@ -1774,11 +1773,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->act_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 |