From: Russell King Date: Mon, 11 Feb 2019 11:46:01 +0000 (+0000) Subject: net: phylink: only call mac_config() during resolve when link is up X-Git-Tag: v5.1-rc1~178^2~268 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0946cf1dc7b6da951b4eb3fbcfd8e926dd0e787b;p=thirdparty%2Fkernel%2Flinux.git net: phylink: only call mac_config() during resolve when link is up There's little point calling mac_config() when the link is down. Signed-off-by: Russell King Signed-off-by: David S. Miller --- diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 2e21ce42e3886..a148866cbb14b 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -302,6 +302,13 @@ static void phylink_mac_config(struct phylink *pl, pl->ops->mac_config(pl->netdev, pl->link_an_mode, state); } +static void phylink_mac_config_up(struct phylink *pl, + const struct phylink_link_state *state) +{ + if (state->link) + phylink_mac_config(pl, state); +} + static void phylink_mac_an_restart(struct phylink *pl) { if (pl->link_config.an_enabled && @@ -401,12 +408,12 @@ static void phylink_resolve(struct work_struct *w) case MLO_AN_PHY: link_state = pl->phy_state; phylink_resolve_flow(pl, &link_state); - phylink_mac_config(pl, &link_state); + phylink_mac_config_up(pl, &link_state); break; case MLO_AN_FIXED: phylink_get_fixed_state(pl, &link_state); - phylink_mac_config(pl, &link_state); + phylink_mac_config_up(pl, &link_state); break; case MLO_AN_INBAND: