Commit 64febc5e authored Jul 10, 2020 by Nicolas Ferre Committed by David S. Miller Jul 10, 2020

net: macb: fix macb_suspend() by removing call to netif_carrier_off()

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: 7897b071 ("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>

parent 253fe094

drivers/net/ethernet/cadence/macb_main.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message