summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Keller <jacob.e.keller@intel.com>2016-05-24 16:56:31 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2016-06-29 14:14:31 -0400
commit8646f7b4cdf2d0557e718c4524a3e31455b92ad7 (patch)
tree9b75e68b35771773ddb256b9b1e00e84a5c23a77
parente3f2350de829eb0c3349f416feed81c0a3ac0732 (diff)
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 <jacob.e.keller@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/igb/igb_main.c2
1 files changed, 2 insertions, 0 deletions
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,
7528 if (netif_running(netdev)) 7528 if (netif_running(netdev))
7529 __igb_close(netdev, true); 7529 __igb_close(netdev, true);
7530 7530
7531 igb_ptp_suspend(adapter);
7532
7531 igb_clear_interrupt_scheme(adapter); 7533 igb_clear_interrupt_scheme(adapter);
7532 7534
7533#ifdef CONFIG_PM 7535#ifdef CONFIG_PM