---

yaml --- r: 134489 b: refs/heads/master c: 955d3fe h: refs/heads/master i: 134487: cc0eba4 v: v3
git-mirror · Feb 13, 2009 · 595fb0a · 595fb0a
1 parent 0acd4ae
commit 595fb0a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8abd3f9bc476b5b7f6de1b6fb576b87ba338f7fd
+refs/heads/master: 955d3fe3e8b38de19761e4ac7afdb9d7a33b9566
diff --git a/trunk/net/mac80211/agg-tx.c b/trunk/net/mac80211/agg-tx.c
@@ -407,9 +407,8 @@ int ieee80211_stop_tx_ba_session(struct ieee80211_hw *hw,
 		ret = local->ops->ampdu_action(hw, IEEE80211_AMPDU_TX_STOP,
 					       &sta->sta, tid, NULL);
 
-	/* case HW denied going back to legacy */
-	if (ret) {
-		WARN_ON(ret != -EBUSY);
+	/* HW shall not deny going back to legacy */
+	if (WARN_ON(ret)) {
 		*state = HT_AGG_STATE_OPERATIONAL;
 		if (hw->ampdu_queues)
 			ieee80211_wake_queue(hw, sta->tid_to_tx_q[tid]);