From patchwork Mon Jul 27 15:38:25 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Rodriguez X-Patchwork-Id: 37562 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 n6RFd550021771 for ; Mon, 27 Jul 2009 15:39:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752723AbZG0Pi1 (ORCPT ); Mon, 27 Jul 2009 11:38:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752706AbZG0Pi1 (ORCPT ); Mon, 27 Jul 2009 11:38:27 -0400 Received: from mail.atheros.com ([12.36.123.2]:18882 "EHLO mail.atheros.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752714AbZG0Pi0 (ORCPT ); Mon, 27 Jul 2009 11:38:26 -0400 Received: from mail.atheros.com ([10.10.20.105]) by sidewinder.atheros.com for ; Mon, 27 Jul 2009 08:38:27 -0700 Received: from smtp.atheros.com (10.10.18.125) by SC1EXHC-01.global.atheros.com (10.10.20.106) with Microsoft SMTP Server (TLS) id 8.0.751.0; Mon, 27 Jul 2009 08:38:26 -0700 Received: by smtp.atheros.com (sSMTP sendmail emulation); Mon, 27 Jul 2009 08:38:26 -0700 From: "Luis R. Rodriguez" To: CC: , , "Luis R. Rodriguez" Subject: [PATCH] mac80211: do not queue work after suspend in the dynamic ps timer Date: Mon, 27 Jul 2009 08:38:25 -0700 Message-ID: <1248709105-12722-1-git-send-email-lrodriguez@atheros.com> X-Mailer: git-send-email 1.6.3.3 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org 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 f60a831..ee83125 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; queue_work(local->hw.workqueue, &local->dynamic_ps_enable_work);