raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit 64febc5e56 ]

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: 7897b071ac ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Nicolas Ferre
2020-07-10 14:46:44 +02:00
committed by Greg Kroah-Hartman
parent 8438f27929
commit feefce6121
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ethernet/cadence/macb_main.c
View 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); bp->pm_data.scrt2 = gem_readl_n(bp, ETHT, SCRT2_ETHT);
} }
netif_carrier_off(netdev);
if (bp->ptp_info) if (bp->ptp_info)
bp->ptp_info->ptp_remove(netdev); bp->ptp_info->ptp_remove(netdev);
pm_runtime_force_suspend(dev); pm_runtime_force_suspend(dev);