diff mbox

sungem: Fix WakeOnLan

Message ID 1335639157-6336-1-git-send-email-gerard.lledo@gmail.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Gerard Lledo April 28, 2012, 6:52 p.m. UTC 
From: Gerard Lledo <gerard.lledo@gmail.com>

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>
---
 drivers/net/ethernet/sun/sungem.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

David Miller May 3, 2012, 5:43 a.m. UTC | #1 
From: Gerard Lledo <gerard.lledo@gmail.com>
Date: Sat, 28 Apr 2012 21:52:37 +0300

> From: Gerard Lledo <gerard.lledo@gmail.com>
> 
> 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>

Applied and queued up for -stable, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
index 558409f..4ba9690 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 */