Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-13 08:39:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

e1000e: Use device_set_wakeup_enable

Browse Source 
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>
This commit is contained in:
\"Rafael J. Wysocki\ 2008-11-12 09:52:32 +00:00 committed by David S. Miller
parent 5f5c4bdb14
commit 6ff68026f4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/e1000e/ethtool.c
View File

@ -1713,7 +1713,8 @@ static void e1000_get_wol(struct net_device *netdev,
wol->supported = 0; wol->supported = 0;
wol->wolopts = 0; wol->wolopts = 0;
if (!(adapter->flags & FLAG_HAS_WOL)) if (!(adapter->flags & FLAG_HAS_WOL) ||
!device_can_wakeup(&adapter->pdev->dev))
return; return;
wol->supported = WAKE_UCAST | WAKE_MCAST | wol->supported = WAKE_UCAST | WAKE_MCAST |
@ -1751,7 +1752,8 @@ static int e1000_set_wol(struct net_device *netdev,
if (wol->wolopts & WAKE_MAGICSECURE) if (wol->wolopts & WAKE_MAGICSECURE)
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (!(adapter->flags & FLAG_HAS_WOL)) if (!(adapter->flags & FLAG_HAS_WOL) ||
!device_can_wakeup(&adapter->pdev->dev))
return wol->wolopts ? -EOPNOTSUPP : 0; return wol->wolopts ? -EOPNOTSUPP : 0;
/* these settings will always override what we currently have */ /* these settings will always override what we currently have */
@ -1770,6 +1772,8 @@ static int e1000_set_wol(struct net_device *netdev,
if (wol->wolopts & WAKE_ARP) if (wol->wolopts & WAKE_ARP)
adapter->wol |= E1000_WUFC_ARP; adapter->wol |= E1000_WUFC_ARP;
device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
return 0; return 0;
} }

1
drivers/net/e1000e/netdev.c
View File

@ -4970,6 +4970,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
/* initialize the wol settings based on the eeprom settings */ /* initialize the wol settings based on the eeprom settings */
adapter->wol = adapter->eeprom_wol; adapter->wol = adapter->eeprom_wol;
device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
/* reset the hardware with the new settings */ /* reset the hardware with the new settings */
e1000e_reset(adapter); e1000e_reset(adapter);