aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2017-12-26 23:15:12 +0000
committerDavid S. Miller <davem@davemloft.net>2018-01-02 13:39:11 -0500
commitac817f5ad066697e4d4d35ec68c974eba2c5f17a (patch)
tree2040fceb6fa2ab69b4dda512a3435d0329a669b1
parentmacvlan: Fix one possible double free (diff)
downloadlinux-dev-ac817f5ad066697e4d4d35ec68c974eba2c5f17a.tar.xz
linux-dev-ac817f5ad066697e4d4d35ec68c974eba2c5f17a.zip
phylink: ensure we report link down when LOS asserted
Although we disable the netdev carrier, we fail to report in the kernel log that the link went down. Fix this. Fixes: 9525ae83959b ("phylink: add phylink infrastructure") Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/phy/phylink.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 827f3f92560e..150cd95a6e1e 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1429,9 +1429,8 @@ static void phylink_sfp_link_down(void *upstream)
WARN_ON(!lockdep_rtnl_is_held());
set_bit(PHYLINK_DISABLE_LINK, &pl->phylink_disable_state);
+ queue_work(system_power_efficient_wq, &pl->resolve);
flush_work(&pl->resolve);
-
- netif_carrier_off(pl->netdev);
}
static void phylink_sfp_link_up(void *upstream)