rt2x00: Fix WMM Queue naming
The Queue names were incorrectly copied from the legacy drivers,
as a result the queue names were inversed to what was expected.
This renames the queues using this mapping:
QID_AC_BK -> QID_AC_VO (priority 0)
QID_AC_BE -> QID_AC_VI (priority 1)
QID_AC_VI -> QID_AC_BE (priority 2)
QID_AC_VO -> QID_AC_BK (priority 3)
Note that this was a naming problem only, which didn't affect
the assignment of frames to their respective queues.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index 52cc92d..ca82b3a 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -746,10 +746,10 @@
return;
switch (queue->qid) {
+ case QID_AC_VO:
+ case QID_AC_VI:
case QID_AC_BE:
case QID_AC_BK:
- case QID_AC_VI:
- case QID_AC_VO:
/*
* For TX queues, we have to disable the queue
* inside mac80211.
@@ -770,10 +770,10 @@
return;
switch (queue->qid) {
+ case QID_AC_VO:
+ case QID_AC_VI:
case QID_AC_BE:
case QID_AC_BK:
- case QID_AC_VI:
- case QID_AC_VO:
/*
* For TX queues, we have to enable the queue
* inside mac80211.
@@ -834,10 +834,10 @@
unsigned int i;
bool started;
bool tx_queue =
- (queue->qid == QID_AC_BE) ||
- (queue->qid == QID_AC_BK) ||
+ (queue->qid == QID_AC_VO) ||
(queue->qid == QID_AC_VI) ||
- (queue->qid == QID_AC_VO);
+ (queue->qid == QID_AC_BE) ||
+ (queue->qid == QID_AC_BK);
mutex_lock(&queue->status_lock);
@@ -1141,7 +1141,7 @@
/*
* Initialize queue parameters.
* RX: qid = QID_RX
- * TX: qid = QID_AC_BE + index
+ * TX: qid = QID_AC_VO + index
* TX: cw_min: 2^5 = 32.
* TX: cw_max: 2^10 = 1024.
* BCN: qid = QID_BEACON
@@ -1149,7 +1149,7 @@
*/
rt2x00queue_init(rt2x00dev, rt2x00dev->rx, QID_RX);
- qid = QID_AC_BE;
+ qid = QID_AC_VO;
tx_queue_for_each(rt2x00dev, queue)
rt2x00queue_init(rt2x00dev, queue, qid++);