diff options
| author |   Russell King <rmk+kernel@armlinux.org.uk> | 2019-02-11 11:46:01 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-02-12 12:22:20 -0500 |
| commit | 0946cf1dc7b6da951b4eb3fbcfd8e926dd0e787b (patch) | |
| tree | 93ae537e91a8e0cbaae67b60bd840835add96600 | |
| parent | Revert "devlink: Add a generic wake_on_lan port parameter" (diff) | |
| download | linux-dev-0946cf1dc7b6da951b4eb3fbcfd8e926dd0e787b.tar.xz linux-dev-0946cf1dc7b6da951b4eb3fbcfd8e926dd0e787b.zip | |
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 <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/phy/phylink.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 2e21ce42e388..a148866cbb14 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: |