From 600378e91dd4d7333d4d7c0f82026f237be8ce0c Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Mon, 27 Jul 2009 08:38:25 -0700
Subject: [PATCH] --- yaml --- r: 156323 b: refs/heads/master c:
 78f1a8b758d57c2d2c9f3db7199cd30803854c82 h: refs/heads/master i:   156321:
 e9541c94d20257246139bdf4da681e16159c607d   156319:
 d18afc014fa9552336a5a0503e2f4ead991ef9fa v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/mlme.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 040a31461bb9..eac75d6db9dc 100644
--- 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
index aca22b00b6a3..07e7e41816be 100644
--- 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);