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

From: nicolas.ferre
Date: Tue Apr 21 2020 - 06:42:06 EST


From: Nicolas Ferre <nicolas.ferre@xxxxxxxxxxxxx>

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@xxxxxxxxxxxxx>
Cc: Harini Katakam <harini.katakam@xxxxxxxxxx>
Cc: Antoine Tenart <antoine.tenart@xxxxxxxxxxx>
Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxxxxxx>
---
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 b17a33c60cd4..72b8983a763a 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -4562,7 +4562,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.20.1