---

yaml --- r: 300684 b: refs/heads/master c: ada1512 h: refs/heads/master v: v3
git-mirror · Apr 10, 2012 · c96e996 · c96e996
1 parent 3978a1b
commit c96e996
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ded81f6ba934e792e441f20178683608cbc0b5cb
+refs/heads/master: ada151252655b63409860e0795993cb369e667cc
diff --git a/trunk/net/mac80211/util.c b/trunk/net/mac80211/util.c
@@ -276,6 +276,9 @@ static void __ieee80211_wake_queue(struct ieee80211_hw *hw, int queue,
 	if (WARN_ON(queue >= hw->queues))
 		return;
 
+	if (!test_bit(reason, &local->queue_stop_reasons[queue]))
+		return;
+
 	__clear_bit(reason, &local->queue_stop_reasons[queue]);
 
 	if (local->queue_stop_reasons[queue] != 0)
@@ -323,6 +326,9 @@ static void __ieee80211_stop_queue(struct ieee80211_hw *hw, int queue,
 	if (WARN_ON(queue >= hw->queues))
 		return;
 
+	if (test_bit(reason, &local->queue_stop_reasons[queue]))
+		return;
+
 	__set_bit(reason, &local->queue_stop_reasons[queue]);
 
 	rcu_read_lock();