---

yaml --- r: 156323 b: refs/heads/master c: 78f1a8b h: refs/heads/master i: 156321: e9541c9 156319: d18afc0 v: v3
git-mirror · Jul 27, 2009 · 600378e · 600378e
1 parent e648f8e
commit 600378e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 082e708acc50a5b625b9bde0bb1af90dfdbd1942
+refs/heads/master: 78f1a8b758d57c2d2c9f3db7199cd30803854c82
diff --git a/trunk/net/mac80211/mlme.c b/trunk/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);