From 1adbf54df762f0e59da7a65be27e3db59a95b1cf Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Wed, 22 Jul 2009 02:58:55 +0000 Subject: [PATCH] --- yaml --- r: 155874 b: refs/heads/master c: 7b55a4a3f761db7daba1ac526ef60f64f5c53689 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/skge.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1948fcf76196..d93ac88747a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d14a7679ae9b7d4eb4b92e81f5039b719fd98c4d +refs/heads/master: 7b55a4a3f761db7daba1ac526ef60f64f5c53689 diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c index 60d502eef4fc..543af2044f40 100644 --- a/trunk/drivers/net/skge.c +++ b/trunk/drivers/net/skge.c @@ -3854,8 +3854,10 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port, skge->speed = -1; skge->advertising = skge_supported_modes(hw); - if (device_may_wakeup(&hw->pdev->dev)) + if (device_can_wakeup(&hw->pdev->dev)) { skge->wol = wol_supported(hw) & WAKE_MAGIC; + device_set_wakeup_enable(&hw->pdev->dev, skge->wol); + } hw->dev[port] = dev;