mac80211: QoS related cleanups
This * makes the queue number passed to drivers a u16 (as it will be with skb_get_queue_mapping) * removes the useless queue number defines * splits hw->queues into hw->queues/ampdu_queues * removes the debugfs files for per-queue counters * removes some dead QoS code * removes the beacon queue configuration for IBSS so that the drivers now never get a queue number bigger than (hw->queues + hw->ampdu_queues - 1) for tx and only in the range 0..hw->queues-1 for conf_tx. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:

committed by
John W. Linville

parent
36fc6757fe
commit
e100bb64bf
@@ -86,12 +86,9 @@ enum data_queue_qid {
|
||||
static inline enum data_queue_qid mac80211_queue_to_qid(unsigned int queue)
|
||||
{
|
||||
/* Regular TX queues are mapped directly */
|
||||
if (queue < NUM_TX_DATA_QUEUES)
|
||||
if (queue < 4)
|
||||
return queue;
|
||||
else if (queue == IEEE80211_TX_QUEUE_BEACON)
|
||||
return QID_BEACON;
|
||||
else if (queue == IEEE80211_TX_QUEUE_AFTER_BEACON)
|
||||
return QID_ATIM;
|
||||
WARN_ON(1);
|
||||
return QID_OTHER;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user