Commit 0946cf1d authored by Russell King's avatar Russell King Committed by David S. Miller

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: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent da203dfa
...@@ -302,6 +302,13 @@ static void phylink_mac_config(struct phylink *pl, ...@@ -302,6 +302,13 @@ static void phylink_mac_config(struct phylink *pl,
pl->ops->mac_config(pl->netdev, pl->link_an_mode, state); 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) static void phylink_mac_an_restart(struct phylink *pl)
{ {
if (pl->link_config.an_enabled && if (pl->link_config.an_enabled &&
...@@ -401,12 +408,12 @@ static void phylink_resolve(struct work_struct *w) ...@@ -401,12 +408,12 @@ static void phylink_resolve(struct work_struct *w)
case MLO_AN_PHY: case MLO_AN_PHY:
link_state = pl->phy_state; link_state = pl->phy_state;
phylink_resolve_flow(pl, &link_state); phylink_resolve_flow(pl, &link_state);
phylink_mac_config(pl, &link_state); phylink_mac_config_up(pl, &link_state);
break; break;
case MLO_AN_FIXED: case MLO_AN_FIXED:
phylink_get_fixed_state(pl, &link_state); phylink_get_fixed_state(pl, &link_state);
phylink_mac_config(pl, &link_state); phylink_mac_config_up(pl, &link_state);
break; break;
case MLO_AN_INBAND: case MLO_AN_INBAND:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment