public inbox for linux-wireless@vger.kernel.org
 help / color / mirror / Atom feed
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
To: linville@tuxdriver.com, johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org, ath9k-devel@lists.ath9k.org,
	"Luis R. Rodriguez" <lrodriguez@atheros.com>
Subject: [PATCH] mac80211: do not queue work after suspend in the dynamic ps timer
Date: Fri, 24 Jul 2009 20:47:32 -0400	[thread overview]
Message-ID: <1248482853-17032-3-git-send-email-lrodriguez@atheros.com> (raw)
In-Reply-To: <1248482853-17032-1-git-send-email-lrodriguez@atheros.com>

This fixes this warning during suspend <--> resume:

WARNING: at net/mac80211/util.c:511 ieee80211_queue_work+0x3a/0x40 [mac80211]()
Hardware name: 6460DWU
queueing ieee80211 work while going to suspend
Modules linked in: <--snip-->
Pid: 0, comm: swapper Not tainted 2.6.31-rc3-wl #4
Call Trace:
 <IRQ>  [<ffffffffa0139d0a>] ? ieee80211_queue_work+0x3a/0x40 [mac80211]
 [<ffffffff810552b8>] warn_slowpath_common+0x78/0xd0
 [<ffffffffa012a580>] ? ieee80211_dynamic_ps_timer+0x0/0x30 [mac80211]
 [<ffffffff81055394>] warn_slowpath_fmt+0x64/0x70
 [<ffffffff810188a9>] ? sched_clock+0x9/0x10
 [<ffffffff8107800c>] ? getnstimeofday+0x5c/0xf0
 [<ffffffff810188a9>] ? sched_clock+0x9/0x10
 [<ffffffff81074625>] ? sched_clock_cpu+0x75/0x240
 [<ffffffffa0139d0a>] ieee80211_queue_work+0x3a/0x40 [mac80211]
 [<ffffffffa012a59c>] ieee80211_dynamic_ps_timer+0x1c/0x30 [mac80211]
 ... etc

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 net/mac80211/mlme.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index a9d717e..98df70d 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -760,7 +760,7 @@ void ieee80211_dynamic_ps_timer(unsigned long data)
 {
 	struct ieee80211_local *local = (void *) data;
 
-	if (local->quiescing)
+	if (local->quiescing || local->suspended)
 		return;
 
 	ieee80211_queue_work(&local->hw, &local->dynamic_ps_enable_work);
-- 
1.6.0.4


  parent reply	other threads:[~2009-07-25  0:47 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-25  0:47 [PATCH] mac80211/drivers: add new mac80211 workqueue API Luis R. Rodriguez
2009-07-25  0:47 ` [PATCH] mac80211: redefine usage of the mac80211 workqueue Luis R. Rodriguez
2009-07-25  8:35   ` Johannes Berg
2009-07-26  8:06     ` Luis R. Rodriguez
2009-07-25  0:47 ` Luis R. Rodriguez [this message]
2009-07-27 15:37   ` [PATCH] mac80211: do not queue work after suspend in the dynamic ps timer Luis R. Rodriguez
2009-07-25  0:47 ` [PATCH] ath9k: cancel xmit poll work at stop() callback Luis R. Rodriguez
2009-07-26  9:48   ` Luis R. Rodriguez
2009-07-25  0:50 ` [PATCH] mac80211/drivers: add new mac80211 workqueue API Luis R. Rodriguez
  -- strict thread matches above, loose matches on Subject: below --
2009-07-27 15:38 [PATCH] mac80211: do not queue work after suspend in the dynamic ps timer Luis R. Rodriguez

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1248482853-17032-3-git-send-email-lrodriguez@atheros.com \
    --to=lrodriguez@atheros.com \
    --cc=ath9k-devel@lists.ath9k.org \
    --cc=johannes@sipsolutions.net \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox