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>
This commit is contained in:

committed by
John W. Linville

parent
dba5dc1ae9
commit
f615e9a38a
@@ -784,25 +784,25 @@ struct hw_pairwise_ta_entry {
|
||||
*/
|
||||
|
||||
/*
|
||||
* AC0_BASE_CSR: AC_BK base address.
|
||||
* AC0_BASE_CSR: AC_VO base address.
|
||||
*/
|
||||
#define AC0_BASE_CSR 0x3400
|
||||
#define AC0_BASE_CSR_RING_REGISTER FIELD32(0xffffffff)
|
||||
|
||||
/*
|
||||
* AC1_BASE_CSR: AC_BE base address.
|
||||
* AC1_BASE_CSR: AC_VI base address.
|
||||
*/
|
||||
#define AC1_BASE_CSR 0x3404
|
||||
#define AC1_BASE_CSR_RING_REGISTER FIELD32(0xffffffff)
|
||||
|
||||
/*
|
||||
* AC2_BASE_CSR: AC_VI base address.
|
||||
* AC2_BASE_CSR: AC_BE base address.
|
||||
*/
|
||||
#define AC2_BASE_CSR 0x3408
|
||||
#define AC2_BASE_CSR_RING_REGISTER FIELD32(0xffffffff)
|
||||
|
||||
/*
|
||||
* AC3_BASE_CSR: AC_VO base address.
|
||||
* AC3_BASE_CSR: AC_BK base address.
|
||||
*/
|
||||
#define AC3_BASE_CSR 0x340c
|
||||
#define AC3_BASE_CSR_RING_REGISTER FIELD32(0xffffffff)
|
||||
@@ -814,7 +814,7 @@ struct hw_pairwise_ta_entry {
|
||||
#define MGMT_BASE_CSR_RING_REGISTER FIELD32(0xffffffff)
|
||||
|
||||
/*
|
||||
* TX_RING_CSR0: TX Ring size for AC_BK, AC_BE, AC_VI, AC_VO.
|
||||
* TX_RING_CSR0: TX Ring size for AC_VO, AC_VI, AC_BE, AC_BK.
|
||||
*/
|
||||
#define TX_RING_CSR0 0x3418
|
||||
#define TX_RING_CSR0_AC0_RING_SIZE FIELD32(0x000000ff)
|
||||
@@ -833,10 +833,10 @@ struct hw_pairwise_ta_entry {
|
||||
|
||||
/*
|
||||
* AIFSN_CSR: AIFSN for each EDCA AC.
|
||||
* AIFSN0: For AC_BK.
|
||||
* AIFSN1: For AC_BE.
|
||||
* AIFSN2: For AC_VI.
|
||||
* AIFSN3: For AC_VO.
|
||||
* AIFSN0: For AC_VO.
|
||||
* AIFSN1: For AC_VI.
|
||||
* AIFSN2: For AC_BE.
|
||||
* AIFSN3: For AC_BK.
|
||||
*/
|
||||
#define AIFSN_CSR 0x3420
|
||||
#define AIFSN_CSR_AIFSN0 FIELD32(0x0000000f)
|
||||
@@ -846,10 +846,10 @@ struct hw_pairwise_ta_entry {
|
||||
|
||||
/*
|
||||
* CWMIN_CSR: CWmin for each EDCA AC.
|
||||
* CWMIN0: For AC_BK.
|
||||
* CWMIN1: For AC_BE.
|
||||
* CWMIN2: For AC_VI.
|
||||
* CWMIN3: For AC_VO.
|
||||
* CWMIN0: For AC_VO.
|
||||
* CWMIN1: For AC_VI.
|
||||
* CWMIN2: For AC_BE.
|
||||
* CWMIN3: For AC_BK.
|
||||
*/
|
||||
#define CWMIN_CSR 0x3424
|
||||
#define CWMIN_CSR_CWMIN0 FIELD32(0x0000000f)
|
||||
@@ -859,10 +859,10 @@ struct hw_pairwise_ta_entry {
|
||||
|
||||
/*
|
||||
* CWMAX_CSR: CWmax for each EDCA AC.
|
||||
* CWMAX0: For AC_BK.
|
||||
* CWMAX1: For AC_BE.
|
||||
* CWMAX2: For AC_VI.
|
||||
* CWMAX3: For AC_VO.
|
||||
* CWMAX0: For AC_VO.
|
||||
* CWMAX1: For AC_VI.
|
||||
* CWMAX2: For AC_BE.
|
||||
* CWMAX3: For AC_BK.
|
||||
*/
|
||||
#define CWMAX_CSR 0x3428
|
||||
#define CWMAX_CSR_CWMAX0 FIELD32(0x0000000f)
|
||||
@@ -883,14 +883,14 @@ struct hw_pairwise_ta_entry {
|
||||
|
||||
/*
|
||||
* TX_CNTL_CSR: KICK/Abort TX.
|
||||
* KICK_TX_AC0: For AC_BK.
|
||||
* KICK_TX_AC1: For AC_BE.
|
||||
* KICK_TX_AC2: For AC_VI.
|
||||
* KICK_TX_AC3: For AC_VO.
|
||||
* ABORT_TX_AC0: For AC_BK.
|
||||
* ABORT_TX_AC1: For AC_BE.
|
||||
* ABORT_TX_AC2: For AC_VI.
|
||||
* ABORT_TX_AC3: For AC_VO.
|
||||
* KICK_TX_AC0: For AC_VO.
|
||||
* KICK_TX_AC1: For AC_VI.
|
||||
* KICK_TX_AC2: For AC_BE.
|
||||
* KICK_TX_AC3: For AC_BK.
|
||||
* ABORT_TX_AC0: For AC_VO.
|
||||
* ABORT_TX_AC1: For AC_VI.
|
||||
* ABORT_TX_AC2: For AC_BE.
|
||||
* ABORT_TX_AC3: For AC_BK.
|
||||
*/
|
||||
#define TX_CNTL_CSR 0x3430
|
||||
#define TX_CNTL_CSR_KICK_TX_AC0 FIELD32(0x00000001)
|
||||
@@ -1010,18 +1010,18 @@ struct hw_pairwise_ta_entry {
|
||||
#define E2PROM_CSR_LOAD_STATUS FIELD32(0x00000040)
|
||||
|
||||
/*
|
||||
* AC_TXOP_CSR0: AC_BK/AC_BE TXOP register.
|
||||
* AC0_TX_OP: For AC_BK, in unit of 32us.
|
||||
* AC1_TX_OP: For AC_BE, in unit of 32us.
|
||||
* AC_TXOP_CSR0: AC_VO/AC_VI TXOP register.
|
||||
* AC0_TX_OP: For AC_VO, in unit of 32us.
|
||||
* AC1_TX_OP: For AC_VI, in unit of 32us.
|
||||
*/
|
||||
#define AC_TXOP_CSR0 0x3474
|
||||
#define AC_TXOP_CSR0_AC0_TX_OP FIELD32(0x0000ffff)
|
||||
#define AC_TXOP_CSR0_AC1_TX_OP FIELD32(0xffff0000)
|
||||
|
||||
/*
|
||||
* AC_TXOP_CSR1: AC_VO/AC_VI TXOP register.
|
||||
* AC2_TX_OP: For AC_VI, in unit of 32us.
|
||||
* AC3_TX_OP: For AC_VO, in unit of 32us.
|
||||
* AC_TXOP_CSR1: AC_BE/AC_BK TXOP register.
|
||||
* AC2_TX_OP: For AC_BE, in unit of 32us.
|
||||
* AC3_TX_OP: For AC_BK, in unit of 32us.
|
||||
*/
|
||||
#define AC_TXOP_CSR1 0x3478
|
||||
#define AC_TXOP_CSR1_AC2_TX_OP FIELD32(0x0000ffff)
|
||||
|
Reference in New Issue
Block a user