]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: macb: fix macb_suspend() by removing call to netif_carrier_off()
authorNicolas Ferre <nicolas.ferre@microchip.com>
Fri, 10 Jul 2020 12:46:44 +0000 (14:46 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 10 Jul 2020 21:29:37 +0000 (14:29 -0700)
As we now use the phylink call to phylink_stop() in the non-WoL path,
there is no need for this call to netif_carrier_off() anymore. It can
disturb the underlying phylink FSM.

Fixes: 46e1536937ee ("net: macb: convert to phylink")
Cc: Claudiu Beznea <claudiu.beznea@microchip.com>
Cc: Harini Katakam <harini.katakam@xilinx.com>
Cc: Antoine Tenart <antoine.tenart@bootlin.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/cadence/macb_main.c

index 79c2fe054303825942b31ef6bdf3eeb51b002205..548815255e22b5d9962a4434e69a5f6a7f6fbfc1 100644 (file)
@@ -4604,7 +4604,6 @@ static int __maybe_unused macb_suspend(struct device *dev)
                        bp->pm_data.scrt2 = gem_readl_n(bp, ETHT, SCRT2_ETHT);
        }
 
-       netif_carrier_off(netdev);
        if (bp->ptp_info)
                bp->ptp_info->ptp_remove(netdev);
        pm_runtime_force_suspend(dev);