[PATCH v5 4/5] net: macb: fix macb_suspend() by removing call to netif_carrier_off()

nicolas.ferre at microchip.com nicolas.ferre at microchip.com
Fri Jul 10 08:46:44 EDT 2020


From: Nicolas Ferre <nicolas.ferre at microchip.com>

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: 7897b071ac3b ("net: macb: convert to phylink")
Cc: Claudiu Beznea <claudiu.beznea at microchip.com>
Cc: Harini Katakam <harini.katakam at xilinx.com>
Cc: Antoine Tenart <antoine.tenart at bootlin.com>
Reviewed-by: Florian Fainelli <f.fainelli at gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre at microchip.com>
---
Changes in v2:
- new in v2 serries

 drivers/net/ethernet/cadence/macb_main.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 79c2fe054303..548815255e22 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -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);
-- 
2.27.0




More information about the linux-arm-kernel mailing list