mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-27 14:28:05 +00:00
Koen Kooi
2177f80076
Duplicate patches between PSP and 3.2.17 have been dropped from the 3.2.17 series Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From 4fb3cd4329db7cba66335fe4d74f5234030cf1a9 Mon Sep 17 00:00:00 2001
|
|
From: Gerard Lledo <gerard.lledo@gmail.com>
|
|
Date: Sat, 28 Apr 2012 08:52:37 +0000
|
|
Subject: [PATCH 16/56] 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>
|
|
---
|
|
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 ceab215..c508d6a 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 */
|
|
--
|
|
1.7.7.6
|
|
|