Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80871e63 authored by Auke Kok's avatar Auke Kok Committed by Jeff Garzik
Browse files

e1000: add shutdown handler back to fix WOL 



Someone was waaay too aggressive and removed e1000's reboot notifier
instead of porting it to the new way of the shutdown handler.  This change
broke wake on lan.  Add the shutdown handler back in using the same method
as e100 uses.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>

(cherry picked from c653e635 commit)
parent 8fc29ba6

drivers/net/e1000/e1000_main.c

+9 −1
Original line number Diff line number Diff line
@@ -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, <linux.nics@intel.com>");
@@ -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