The patch titled
igb: use device_set_wakeup_enable
has been removed from the -mm tree. Its filename was
igb-use-device_set_wakeup_enable.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: igb: use device_set_wakeup_enable
From: Rafael J. Wysocki <rjw@xxxxxxx>
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 igb_set_wol().
Accordingly, use device_can_wakeup() for checking if wake-up is supported
by the device.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/igb/igb_ethtool.c | 8 ++++++--
drivers/net/igb/igb_main.c | 1 +
2 files changed, 7 insertions(+), 2 deletions(-)
diff -puN drivers/net/igb/igb_ethtool.c~igb-use-device_set_wakeup_enable drivers/net/igb/igb_ethtool.c
--- a/drivers/net/igb/igb_ethtool.c~igb-use-device_set_wakeup_enable
+++ a/drivers/net/igb/igb_ethtool.c
@@ -1776,7 +1776,8 @@ static void igb_get_wol(struct net_devic
/* this function will set ->supported = 0 and return 1 if wol is not
* supported by this hardware */
- if (igb_wol_exclusion(adapter, wol))
+ if (igb_wol_exclusion(adapter, wol) ||
+ !device_can_wakeup(&adapter->pdev->dev))
return;
/* apply any specific unsupported masks here */
@@ -1805,7 +1806,8 @@ static int igb_set_wol(struct net_device
if (wol->wolopts & (WAKE_PHY | WAKE_ARP | WAKE_MAGICSECURE))
return -EOPNOTSUPP;
- if (igb_wol_exclusion(adapter, wol))
+ if (igb_wol_exclusion(adapter, wol) ||
+ !device_can_wakeup(&adapter->pdev->dev))
return wol->wolopts ? -EOPNOTSUPP : 0;
switch (hw->device_id) {
@@ -1825,6 +1827,8 @@ static int igb_set_wol(struct net_device
if (wol->wolopts & WAKE_MAGIC)
adapter->wol |= E1000_WUFC_MAG;
+ device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
+
return 0;
}
diff -puN drivers/net/igb/igb_main.c~igb-use-device_set_wakeup_enable drivers/net/igb/igb_main.c
--- a/drivers/net/igb/igb_main.c~igb-use-device_set_wakeup_enable
+++ a/drivers/net/igb/igb_main.c
@@ -1244,6 +1244,7 @@ static int __devinit igb_probe(struct pc
/* initialize the wol settings based on the eeprom settings */
adapter->wol = adapter->eeprom_wol;
+ device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
/* reset the hardware with the new settings */
igb_reset(adapter);
_
Patches currently in -mm which might be from rjw@xxxxxxx are
origin.patch
linux-next.patch
vfs-fix-switch_names-breakage-in-short-to-short-case.patch
shrink_slab-handle-bad-shrinkers.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
