diff options
author | Ivo van Doorn <ivdoorn@gmail.com> | 2010-12-13 06:36:38 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-12-13 15:23:36 -0500 |
commit | f615e9a38a8e6239d35891a05f2ac1159088780a (patch) | |
tree | 7aa1d79a6b02b222f321d5a747eff0cf6e8d1e4f /drivers/net/wireless/rt2x00/rt2400pci.c | |
parent | dba5dc1ae9764902f46d5225c9ff40e4f7b614c7 (diff) |
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/rt2400pci.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2400pci.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c index 2fc6ca5e0968..54ca49ad3472 100644 --- a/drivers/net/wireless/rt2x00/rt2400pci.c +++ b/drivers/net/wireless/rt2x00/rt2400pci.c | |||
@@ -664,12 +664,12 @@ static void rt2400pci_kick_queue(struct data_queue *queue) | |||
664 | u32 reg; | 664 | u32 reg; |
665 | 665 | ||
666 | switch (queue->qid) { | 666 | switch (queue->qid) { |
667 | case QID_AC_BE: | 667 | case QID_AC_VO: |
668 | rt2x00pci_register_read(rt2x00dev, TXCSR0, ®); | 668 | rt2x00pci_register_read(rt2x00dev, TXCSR0, ®); |
669 | rt2x00_set_field32(®, TXCSR0_KICK_PRIO, 1); | 669 | rt2x00_set_field32(®, TXCSR0_KICK_PRIO, 1); |
670 | rt2x00pci_register_write(rt2x00dev, TXCSR0, reg); | 670 | rt2x00pci_register_write(rt2x00dev, TXCSR0, reg); |
671 | break; | 671 | break; |
672 | case QID_AC_BK: | 672 | case QID_AC_VI: |
673 | rt2x00pci_register_read(rt2x00dev, TXCSR0, ®); | 673 | rt2x00pci_register_read(rt2x00dev, TXCSR0, ®); |
674 | rt2x00_set_field32(®, TXCSR0_KICK_TX, 1); | 674 | rt2x00_set_field32(®, TXCSR0_KICK_TX, 1); |
675 | rt2x00pci_register_write(rt2x00dev, TXCSR0, reg); | 675 | rt2x00pci_register_write(rt2x00dev, TXCSR0, reg); |
@@ -690,8 +690,8 @@ static void rt2400pci_stop_queue(struct data_queue *queue) | |||
690 | u32 reg; | 690 | u32 reg; |
691 | 691 | ||
692 | switch (queue->qid) { | 692 | switch (queue->qid) { |
693 | case QID_AC_BE: | 693 | case QID_AC_VO: |
694 | case QID_AC_BK: | 694 | case QID_AC_VI: |
695 | case QID_ATIM: | 695 | case QID_ATIM: |
696 | rt2x00pci_register_read(rt2x00dev, TXCSR0, ®); | 696 | rt2x00pci_register_read(rt2x00dev, TXCSR0, ®); |
697 | rt2x00_set_field32(®, TXCSR0_ABORT, 1); | 697 | rt2x00_set_field32(®, TXCSR0_ABORT, 1); |
@@ -1322,13 +1322,13 @@ static irqreturn_t rt2400pci_interrupt_thread(int irq, void *dev_instance) | |||
1322 | * 4 - Priority ring transmit done interrupt. | 1322 | * 4 - Priority ring transmit done interrupt. |
1323 | */ | 1323 | */ |
1324 | if (rt2x00_get_field32(reg, CSR7_TXDONE_PRIORING)) | 1324 | if (rt2x00_get_field32(reg, CSR7_TXDONE_PRIORING)) |
1325 | rt2400pci_txdone(rt2x00dev, QID_AC_BE); | 1325 | rt2400pci_txdone(rt2x00dev, QID_AC_VO); |
1326 | 1326 | ||
1327 | /* | 1327 | /* |
1328 | * 5 - Tx ring transmit done interrupt. | 1328 | * 5 - Tx ring transmit done interrupt. |
1329 | */ | 1329 | */ |
1330 | if (rt2x00_get_field32(reg, CSR7_TXDONE_TXRING)) | 1330 | if (rt2x00_get_field32(reg, CSR7_TXDONE_TXRING)) |
1331 | rt2400pci_txdone(rt2x00dev, QID_AC_BK); | 1331 | rt2400pci_txdone(rt2x00dev, QID_AC_VI); |
1332 | 1332 | ||
1333 | /* Enable interrupts again. */ | 1333 | /* Enable interrupts again. */ |
1334 | rt2x00dev->ops->lib->set_device_state(rt2x00dev, | 1334 | rt2x00dev->ops->lib->set_device_state(rt2x00dev, |