OSDN Git Service

sungem: Fix WakeOnLan
authorGerard Lledo <gerard.lledo@gmail.com>
Sat, 28 Apr 2012 08:52:37 +0000 (08:52 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 May 2012 16:40:00 +0000 (09:40 -0700)
[ 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/sungem.c

index ab59300..361beb7 100644 (file)
@@ -2363,7 +2363,7 @@ static int gem_suspend(struct pci_dev *pdev, pm_message_t state)
                netif_device_detach(dev);
 
                /* Switch off MAC, remember WOL setting */
-               gp->asleep_wol = gp->wake_on_lan;
+               gp->asleep_wol = !!gp->wake_on_lan;
                gem_do_stop(dev, gp->asleep_wol);
        } else
                gp->asleep_wol = 0;