aboutsummaryrefslogtreecommitdiff
path: root/net/mac80211/ieee80211.c
diff options
context:
space:
mode:
authorRon Rindjunsky <ron.rindjunsky@intel.com>2008-01-28 14:07:18 +0200
committerJohn W. Linville <linville@tuxdriver.com>2008-02-29 15:19:17 -0500
commit9e7234923789897858e1a475c579b5e2e6ad5b74 (patch)
tree69e97df9ff34f9237bfddee6e99100e8e16e1da1 /net/mac80211/ieee80211.c
parenteadc8d9e9047266a8914eb2ed4d36e797ce540d1 (diff)
mac80211: A-MPDU Tx adding qdisc support
This patch allows qdisc support in A-MPDU Tx. a method to handle QoS <-> TID switches is present in this patch. Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ieee80211.c')
-rw-r--r--net/mac80211/ieee80211.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index c323c9af9b8..f8e734f0da1 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -462,7 +462,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_hw *hw, u8 *ra, u16 tid)
spin_lock_bh(&local->mdev->queue_lock);
/* create a new queue for this aggregation */
- /* ret = ieee80211_ht_agg_queue_add(local, sta, tid); */
+ ret = ieee80211_ht_agg_queue_add(local, sta, tid);
/* case no queue is available to aggregation
* don't switch to aggregation */
@@ -488,7 +488,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_hw *hw, u8 *ra, u16 tid)
/* No need to requeue the packets in the agg queue, since we
* held the tx lock: no packet could be enqueued to the newly
* allocated queue */
- /* ieee80211_ht_agg_queue_remove(local, sta, tid, 0); */
+ ieee80211_ht_agg_queue_remove(local, sta, tid, 0);
#ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "BA request denied - HW or queue unavailable"
" for tid %d\n", tid);
@@ -499,7 +499,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_hw *hw, u8 *ra, u16 tid)
}
/* Will put all the packets in the new SW queue */
- /* ieee80211_requeue(local, ieee802_1d_to_ac[tid]); */
+ ieee80211_requeue(local, ieee802_1d_to_ac[tid]);
spin_unlock_bh(&local->mdev->queue_lock);
/* We have most probably almost emptied the legacy queue */
@@ -675,7 +675,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u8 tid)
* the content of the qdiscs */
spin_lock_bh(&local->mdev->queue_lock);
/* remove the queue for this aggregation */
- /* ieee80211_ht_agg_queue_remove(local, sta, tid, 1); */
+ ieee80211_ht_agg_queue_remove(local, sta, tid, 1);
spin_unlock_bh(&local->mdev->queue_lock);
/* we just requeued the all the frames that were in the removed