From a2fcf3726356ebc274cff9d904d590109778f14c Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Tue, 23 May 2006 13:35:57 -0700 Subject: [PATCH] --- yaml --- r: 26991 b: refs/heads/master c: 80871e63e410c53524ef47eaf475c13e0f164ea6 h: refs/heads/master i: 26989: e73bb2b738655db6ecb1eb454d5713986024ce0b 26987: 8035b47603a31c5930d98eb9784cbc4dd84b3303 26983: d5a85ece1e2ba2d8deefe08d1df5050d88ad87f4 26975: a062af885ce60237e0fe66952cf76165c2d106f6 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_main.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ef8d43c3b6ec..4a0bbbc6568a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8fc29ba65bd669b8f23a46b4760f3ba773e2a635 +refs/heads/master: 80871e63e410c53524ef47eaf475c13e0f164ea6 diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index c99e87838f92..ed15fcaedaf9 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/drivers/net/e1000/e1000_main.c @@ -220,6 +220,7 @@ static void e1000_restore_vlan(struct e1000_adapter *adapter); static int e1000_suspend(struct pci_dev *pdev, pm_message_t state); static int e1000_resume(struct pci_dev *pdev); #endif +static void e1000_shutdown(struct pci_dev *pdev); #ifdef CONFIG_NET_POLL_CONTROLLER /* for netdump / net console */ @@ -235,8 +236,9 @@ static struct pci_driver e1000_driver = { /* Power Managment Hooks */ #ifdef CONFIG_PM .suspend = e1000_suspend, - .resume = e1000_resume + .resume = e1000_resume, #endif + .shutdown = e1000_shutdown }; MODULE_AUTHOR("Intel Corporation, "); @@ -4611,6 +4613,12 @@ e1000_resume(struct pci_dev *pdev) return 0; } #endif + +static void e1000_shutdown(struct pci_dev *pdev) +{ + e1000_suspend(pdev, PMSG_SUSPEND); +} + #ifdef CONFIG_NET_POLL_CONTROLLER /* * Polling 'interrupt' - used by things like netconsole to send skbs