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/rt2500pci.c | |
| parent | dba5dc1ae9764902f46d5225c9ff40e4f7b614c7 (diff) | |
| download | blackbird-op-linux-f615e9a38a8e6239d35891a05f2ac1159088780a.tar.gz blackbird-op-linux-f615e9a38a8e6239d35891a05f2ac1159088780a.zip | |
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/rt2500pci.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2500pci.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c index d67f91192338..a9ff26a27724 100644 --- a/drivers/net/wireless/rt2x00/rt2500pci.c +++ b/drivers/net/wireless/rt2x00/rt2500pci.c @@ -754,12 +754,12 @@ static void rt2500pci_kick_queue(struct data_queue *queue) u32 reg; switch (queue->qid) { - case QID_AC_BE: + case QID_AC_VO: rt2x00pci_register_read(rt2x00dev, TXCSR0, ®); rt2x00_set_field32(®, TXCSR0_KICK_PRIO, 1); rt2x00pci_register_write(rt2x00dev, TXCSR0, reg); break; - case QID_AC_BK: + case QID_AC_VI: rt2x00pci_register_read(rt2x00dev, TXCSR0, ®); rt2x00_set_field32(®, TXCSR0_KICK_TX, 1); rt2x00pci_register_write(rt2x00dev, TXCSR0, reg); @@ -780,8 +780,8 @@ static void rt2500pci_stop_queue(struct data_queue *queue) u32 reg; switch (queue->qid) { - case QID_AC_BE: - case QID_AC_BK: + case QID_AC_VO: + case QID_AC_VI: case QID_ATIM: rt2x00pci_register_read(rt2x00dev, TXCSR0, ®); rt2x00_set_field32(®, TXCSR0_ABORT, 1); @@ -1455,13 +1455,13 @@ static irqreturn_t rt2500pci_interrupt_thread(int irq, void *dev_instance) * 4 - Priority ring transmit done interrupt. */ if (rt2x00_get_field32(reg, CSR7_TXDONE_PRIORING)) - rt2500pci_txdone(rt2x00dev, QID_AC_BE); + rt2500pci_txdone(rt2x00dev, QID_AC_VO); /* * 5 - Tx ring transmit done interrupt. */ if (rt2x00_get_field32(reg, CSR7_TXDONE_TXRING)) - rt2500pci_txdone(rt2x00dev, QID_AC_BK); + rt2500pci_txdone(rt2x00dev, QID_AC_VI); /* Enable interrupts again. */ rt2x00dev->ops->lib->set_device_state(rt2x00dev, |
