diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-14 12:27:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-14 12:27:19 -0700 |
| commit | 88512935a24305fea7aecc9ba4d675869e97fc2a (patch) | |
| tree | 8bce14ba3d119719bf2d8865fa366384fd45af34 /net/mac80211 | |
| parent | 8a62babfb87aa5911e87e0ce38381bdfdc4a2b83 (diff) | |
| parent | 6b26dead3ce97d016b57724b01974d5ca5c84bd5 (diff) | |
| download | op-kernel-dev-88512935a24305fea7aecc9ba4d675869e97fc2a.zip op-kernel-dev-88512935a24305fea7aecc9ba4d675869e97fc2a.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/agg-tx.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c index 9e5762a..a24e598 100644 --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c @@ -381,6 +381,14 @@ static void ieee80211_agg_splice_packets(struct ieee80211_local *local, &local->hw, queue, IEEE80211_QUEUE_STOP_REASON_AGGREGATION); + if (!(sta->ampdu_mlme.tid_state_tx[tid] & HT_ADDBA_REQUESTED_MSK)) + return; + + if (WARN(!sta->ampdu_mlme.tid_tx[tid], + "TID %d gone but expected when splicing aggregates from" + "the pending queue\n", tid)) + return; + if (!skb_queue_empty(&sta->ampdu_mlme.tid_tx[tid]->pending)) { spin_lock_irqsave(&local->queue_stop_reason_lock, flags); /* mark queue as pending, it is stopped already */ |
