aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/netdev.c
diff options
context:
space:
mode:
author\"Rafael J. Wysocki\ <rjw@sisk.pl>2008-11-12 04:52:32 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-16 04:35:45 -0500
commit6ff68026f4757d68461b7fbeca5c944e1f5f8b44 (patch)
tree13285973e74a60ad7f86f5c50d8362a6bcacd426 /drivers/net/e1000e/netdev.c
parent5f5c4bdb144bf285727867bbd75c13c5a99150c9 (diff)
e1000e: 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/e1000e/netdev.c')
-rw-r--r--drivers/net/e1000e/netdev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index abd492b7336d..2c8dffdc889f 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4970,6 +4970,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
4970 4970
4971 /* initialize the wol settings based on the eeprom settings */ 4971 /* initialize the wol settings based on the eeprom settings */
4972 adapter->wol = adapter->eeprom_wol; 4972 adapter->wol = adapter->eeprom_wol;
4973 device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
4973 4974
4974 /* reset the hardware with the new settings */ 4975 /* reset the hardware with the new settings */
4975 e1000e_reset(adapter); 4976 e1000e_reset(adapter);