diff options
| author | Gerard Lledo <gerard.lledo@gmail.com> | 2012-04-28 08:52:37 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-05-20 22:56:36 +0100 |
| commit | 9dd8816dbc51731902518c28e08e3f279e4f0731 (patch) | |
| tree | 2934d4f7958c24dea7819502312c3a860e118d81 | |
| parent | 2599c5942675bd800a9b97a15c30611cd2559a42 (diff) | |
| download | lwn-9dd8816dbc51731902518c28e08e3f279e4f0731.tar.gz lwn-9dd8816dbc51731902518c28e08e3f279e4f0731.zip | |
sungem: Fix WakeOnLan
[ Upstream commit 5a8887d39e1ba5ee2d4ccb94b14d6f2dce5ddfca ]
WakeOnLan was broken in this driver because gp->asleep_wol is a 1-bit
bitfield and it was being assigned WAKE_MAGIC, which is (1 << 5).
gp->asleep_wol remains 0 and the machine never wakes up. Fixed by casting
gp->wake_on_lan to bool. Tested on an iBook G4.
Signed-off-by: Gerard Lledo <gerard.lledo@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/net/ethernet/sun/sungem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c index ceab215bb4a3..c508d6aea844 100644 --- a/drivers/net/ethernet/sun/sungem.c +++ b/drivers/net/ethernet/sun/sungem.c @@ -2340,7 +2340,7 @@ static int gem_suspend(struct pci_dev *pdev, pm_message_t state) netif_device_detach(dev); /* Switch off chip, remember WOL setting */ - gp->asleep_wol = gp->wake_on_lan; + gp->asleep_wol = !!gp->wake_on_lan; gem_do_stop(dev, gp->asleep_wol); /* Unlock the network stack */ |