From: Jacob Keller Date: Tue, 24 May 2016 20:56:31 +0000 (-0700) Subject: igb: call igb_ptp_suspend during suspend/resume cycle X-Git-Tag: MMI-PSA29.97-13-9~7505^2~219^2~4 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8646f7b4cdf2d0557e718c4524a3e31455b92ad7;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git igb: call igb_ptp_suspend during suspend/resume cycle Properly stop the extra workqueue items and ensure that we resume cleanly. This is better than using igb_ptp_init and igb_ptp_stop since these functions destroy the PHC device, which will cause other problems if we do so. Since igb_ptp_reset now re-schedules the work-queue item we don't need an equivalent igb_ptp_resume in the resume workflow. Signed-off-by: Jacob Keller Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher --- diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 750a5d865c9f..a15f82600802 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -7528,6 +7528,8 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake, if (netif_running(netdev)) __igb_close(netdev, true); + igb_ptp_suspend(adapter); + igb_clear_interrupt_scheme(adapter); #ifdef CONFIG_PM