From 364afe7efb7d75665c3c012b434acaaa97db6ff7 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Mon, 25 Oct 2010 13:01:55 +0000 Subject: [PATCH] --- yaml --- r: 218445 b: refs/heads/master c: f2dc0d1809ab7e0147c7e4ac837be1682f706538 h: refs/heads/master i: 218443: 0cbfff7cf69db058e45ffb611e304ad926632e47 v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 352c37adf2b3..fcbde796ffd4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78fd9c4491a9c4cf8b401f1c5a516d3d28d3b42b +refs/heads/master: f2dc0d1809ab7e0147c7e4ac837be1682f706538 diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index 852e917778f8..30ccbb6d097a 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -9948,16 +9948,16 @@ static int tg3_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) !((tp->tg3_flags & TG3_FLAG_WOL_CAP) && device_can_wakeup(dp))) return -EINVAL; + device_set_wakeup_enable(dp, wol->wolopts & WAKE_MAGIC); + spin_lock_bh(&tp->lock); - if (wol->wolopts & WAKE_MAGIC) { + if (device_may_wakeup(dp)) tp->tg3_flags |= TG3_FLAG_WOL_ENABLE; - device_set_wakeup_enable(dp, true); - } else { + else tp->tg3_flags &= ~TG3_FLAG_WOL_ENABLE; - device_set_wakeup_enable(dp, false); - } spin_unlock_bh(&tp->lock); + return 0; }