From 54d77ed68c003ac3ac3fee29cf479ab99c9f4067 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 19 Nov 2009 14:29:39 +0100
Subject: [PATCH] --- yaml --- r: 168958 b: refs/heads/master c:
 ceb99fe071eb688255798d89be337affffa2b103 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/net/mac80211/ieee80211_i.h |  8 ++++++++
 trunk/net/mac80211/util.c        | 19 +++++++++----------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 387aed00911c..b38229832b10 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ade00824607fcfa8842572012d4393b40a74a94
+refs/heads/master: ceb99fe071eb688255798d89be337affffa2b103
diff --git a/trunk/net/mac80211/ieee80211_i.h b/trunk/net/mac80211/ieee80211_i.h
index 588005c84a6d..a910bf1f092f 100644
--- a/trunk/net/mac80211/ieee80211_i.h
+++ b/trunk/net/mac80211/ieee80211_i.h
@@ -661,6 +661,14 @@ struct ieee80211_local {
 	 */
 	bool suspended;
 
+	/*
+	 * Resuming is true while suspended, but when we're reprogramming the
+	 * hardware -- at that time it's allowed to use ieee80211_queue_work()
+	 * again even though some other parts of the stack are still suspended
+	 * and we still drop received frames to avoid waking the stack.
+	 */
+	bool resuming;
+
 	/*
 	 * quiescing is true during the suspend process _only_ to
 	 * ease timer cancelling etc.
diff --git a/trunk/net/mac80211/util.c b/trunk/net/mac80211/util.c
index aeb65b3d2295..e6c08da8da26 100644
--- a/trunk/net/mac80211/util.c
+++ b/trunk/net/mac80211/util.c
@@ -520,9 +520,9 @@ EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces_atomic);
  */
 static bool ieee80211_can_queue_work(struct ieee80211_local *local)
 {
-        if (WARN(local->suspended, "queueing ieee80211 work while "
-		 "going to suspend\n"))
-                return false;
+	if (WARN(local->suspended && !local->resuming,
+		 "queueing ieee80211 work while going to suspend\n"))
+		return false;
 
 	return true;
 }
@@ -1025,13 +1025,9 @@ int ieee80211_reconfig(struct ieee80211_local *local)
 	struct sta_info *sta;
 	unsigned long flags;
 	int res;
-	bool from_suspend = local->suspended;
 
-	/*
-	 * We're going to start the hardware, at that point
-	 * we are no longer suspended and can RX frames.
-	 */
-	local->suspended = false;
+	if (local->suspended)
+		local->resuming = true;
 
 	/* restart hardware */
 	if (local->open_count) {
@@ -1129,11 +1125,14 @@ int ieee80211_reconfig(struct ieee80211_local *local)
 	 * If this is for hw restart things are still running.
 	 * We may want to change that later, however.
 	 */
-	if (!from_suspend)
+	if (!local->suspended)
 		return 0;
 
 #ifdef CONFIG_PM
+	/* first set suspended false, then resuming */
 	local->suspended = false;
+	mb();
+	local->resuming = false;
 
 	list_for_each_entry(sdata, &local->interfaces, list) {
 		switch(sdata->vif.type) {