diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-26 10:01:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-26 10:01:25 -0700 |
| commit | c8b201ff867e64b6233d069563081775269f4499 (patch) | |
| tree | 35d363e6cb565fd7285480dc877a2da79eafb9a7 /net/mac80211/agg-tx.c | |
| parent | 436b355b96042ab6564f43a7dabd5c61d9634ff7 (diff) | |
| parent | 249b405cf8145da8a74b70544ae1079d244bdb00 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/agg-tx.c')
| -rw-r--r-- | net/mac80211/agg-tx.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c index 9e5762ad307..1958c7c42cd 100644 --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c @@ -383,9 +383,6 @@ static void ieee80211_agg_splice_packets(struct ieee80211_local *local, 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 */ - __set_bit(IEEE80211_QUEUE_STOP_REASON_PENDING, - &local->queue_stop_reasons[queue]); /* copy over remaining packets */ skb_queue_splice_tail_init( &sta->ampdu_mlme.tid_tx[tid]->pending, |