From patchwork Sat Jul 25 00:47:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Rodriguez X-Patchwork-Id: 37276 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6P0lfEJ001937 for ; Sat, 25 Jul 2009 00:47:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755158AbZGYArh (ORCPT ); Fri, 24 Jul 2009 20:47:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755142AbZGYArg (ORCPT ); Fri, 24 Jul 2009 20:47:36 -0400 Received: from bombadil.infradead.org ([18.85.46.34]:56620 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754130AbZGYArf (ORCPT ); Fri, 24 Jul 2009 20:47:35 -0400 Received: from mcgrof by bombadil.infradead.org with local (Exim 4.69 #1 (Red Hat Linux)) id 1MUVQD-0004RH-Cl; Sat, 25 Jul 2009 00:47:33 +0000 From: "Luis R. Rodriguez" To: linville@tuxdriver.com, johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, ath9k-devel@venema.h4ckr.net, "Luis R. Rodriguez" Subject: [PATCH] mac80211: do not queue work after suspend in the dynamic ps timer Date: Fri, 24 Jul 2009 20:47:32 -0400 Message-Id: <1248482853-17032-3-git-send-email-lrodriguez@atheros.com> X-Mailer: git-send-email 1.6.2.rc1.3.g81d3f In-Reply-To: <1248482853-17032-1-git-send-email-lrodriguez@atheros.com> References: <1248482853-17032-1-git-send-email-lrodriguez@atheros.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org 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: [] ? ieee80211_queue_work+0x3a/0x40 [mac80211] [] warn_slowpath_common+0x78/0xd0 [] ? ieee80211_dynamic_ps_timer+0x0/0x30 [mac80211] [] warn_slowpath_fmt+0x64/0x70 [] ? sched_clock+0x9/0x10 [] ? getnstimeofday+0x5c/0xf0 [] ? sched_clock+0x9/0x10 [] ? sched_clock_cpu+0x75/0x240 [] ieee80211_queue_work+0x3a/0x40 [mac80211] [] ieee80211_dynamic_ps_timer+0x1c/0x30 [mac80211] ... etc Signed-off-by: Luis R. Rodriguez --- 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);