Message ID | E1eTyRE-0007ZC-Ap@rmk-PC.armlinux.org.uk |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Series | [net] phylink: ensure we report link down when LOS asserted | expand |
On 12/26/2017 03:15 PM, Russell King wrote: > Although we disable the netdev carrier, we fail to report in the kernel > log that the link went down. Fix this. > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Fixes: 9525ae83959b ("phylink: add phylink infrastructure")
From: Russell King <rmk+kernel@armlinux.org.uk> Date: Tue, 26 Dec 2017 23:15:12 +0000 > Although we disable the netdev carrier, we fail to report in the kernel > log that the link went down. Fix this. > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Applied and queued up for -stable.
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)
Although we disable the netdev carrier, we fail to report in the kernel log that the link went down. Fix this. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- drivers/net/phy/phylink.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)