summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorGerard Lledo <gerard.lledo@gmail.com>2012-04-28 10:52:37 +0200
committerDavid S. Miller <davem@davemloft.net>2012-05-03 07:42:55 +0200
commit5a8887d39e1ba5ee2d4ccb94b14d6f2dce5ddfca (patch)
tree5d3c23ec08162d5ccee13d82923b58e143d74adf /drivers/net
parenttcp: change tcp_adv_win_scale and tcp_rmem[2] (diff)
downloadlinux-5a8887d39e1ba5ee2d4ccb94b14d6f2dce5ddfca.tar.xz
linux-5a8887d39e1ba5ee2d4ccb94b14d6f2dce5ddfca.zip
sungem: Fix WakeOnLan
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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/sun/sungem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
index 558409ff4058..4ba969096717 100644
--- a/drivers/net/ethernet/sun/sungem.c
+++ b/drivers/net/ethernet/sun/sungem.c
@@ -2339,7 +2339,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 */