diff options
| author | Ivo van Doorn <ivdoorn@gmail.com> | 2010-12-13 12:36:38 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-13 15:23:36 -0500 |
| commit | f615e9a38a8e6239d35891a05f2ac1159088780a (patch) | |
| tree | 7aa1d79a6b02b222f321d5a747eff0cf6e8d1e4f /drivers/net/wireless/rt2x00/rt2x00queue.c | |
| parent | dba5dc1ae9764902f46d5225c9ff40e4f7b614c7 (diff) | |
| download | kernel_samsung_smdk4412-f615e9a38a8e6239d35891a05f2ac1159088780a.zip kernel_samsung_smdk4412-f615e9a38a8e6239d35891a05f2ac1159088780a.tar.gz kernel_samsung_smdk4412-f615e9a38a8e6239d35891a05f2ac1159088780a.tar.bz2 | |
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>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00queue.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00queue.c | 18 |
1 files changed, 9 insertions, 9 deletions
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 @@ void rt2x00queue_pause_queue(struct data_queue *queue) 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 @@ void rt2x00queue_unpause_queue(struct data_queue *queue) 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 @@ void rt2x00queue_flush_queue(struct data_queue *queue, bool drop) 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 @@ int rt2x00queue_allocate(struct rt2x00_dev *rt2x00dev) /* * 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 @@ int rt2x00queue_allocate(struct rt2x00_dev *rt2x00dev) */ 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++); |