summaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000/e1000_main.c
diff options
context:
space:
mode:
author\"Rafael J. Wysocki\ <rjw@sisk.pl>2008-11-07 20:30:19 +0000
committerDavid S. Miller <davem@davemloft.net>2008-11-16 01:35:56 -0800
commitde1264896c8012a261c1cba17e6a61199c276ad3 (patch)
tree9a91175b435d83f597f8ca784130ec54d42ba4a7 /drivers/net/e1000/e1000_main.c
parent6ff68026f4757d68461b7fbeca5c944e1f5f8b44 (diff)
downloadblackbird-op-linux-de1264896c8012a261c1cba17e6a61199c276ad3.tar.gz
blackbird-op-linux-de1264896c8012a261c1cba17e6a61199c276ad3.zip
e1000: Use device_set_wakeup_enable
Since dev->power.should_wakeup bit is used by the PCI core to decide whether the device should wake up the system from sleep states, set/unset this bit whenever WOL is enabled/disabled using e1000_set_wol(). Accordingly, use device_can_wakeup() for checking if wake-up is supported by the device. Signed-off-by: "Rafael J. Wysocki" <rjw@sisk.pl> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
-rw-r--r--drivers/net/e1000/e1000_main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index fac82152e4c8..872799b746f5 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -1179,6 +1179,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
/* initialize the wol settings based on the eeprom settings */
adapter->wol = adapter->eeprom_wol;
+ device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
/* print bus type/speed/width info */
DPRINTK(PROBE, INFO, "(PCI%s:%s:%s) ",
OpenPOWER on IntegriCloud