From: Luis R. Rodriguez <lrodriguez@atheros.com>
Date: Mon, 27 Jul 2009 15:38:25 +0000 (-0700)
Subject: mac80211: do not queue work after suspend in the dynamic ps timer
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=78f1a8b758d57c2d2c9f3db7199cd30803854c82;p=linux-beck.git

mac80211: do not queue work after suspend in the dynamic ps timer

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index aca22b00b6a3..07e7e41816be 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -721,7 +721,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);