Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43438master
parent
5ec23daa26
commit
47f09fd345
@ -0,0 +1,31 @@ |
|||||||
|
From: Felix Fietkau <nbd@openwrt.org>
|
||||||
|
Date: Sun, 30 Nov 2014 20:30:46 +0100
|
||||||
|
Subject: [PATCH] ath9k_hw: fix hardware queue allocation
|
||||||
|
|
||||||
|
The driver passes the desired hardware queue index for a WMM data queue
|
||||||
|
in qinfo->tqi_subtype. This was ignored in ath9k_hw_setuptxqueue, which
|
||||||
|
instead relied on the order in which the function is called.
|
||||||
|
|
||||||
|
Cc: stable@vger.kernel.org
|
||||||
|
Reported-by: Hubert Feurstein <h.feurstein@gmail.com>
|
||||||
|
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
||||||
|
---
|
||||||
|
|
||||||
|
--- a/drivers/net/wireless/ath/ath9k/mac.c
|
||||||
|
+++ b/drivers/net/wireless/ath/ath9k/mac.c
|
||||||
|
@@ -311,14 +311,7 @@ int ath9k_hw_setuptxqueue(struct ath_hw
|
||||||
|
q = ATH9K_NUM_TX_QUEUES - 3;
|
||||||
|
break;
|
||||||
|
case ATH9K_TX_QUEUE_DATA:
|
||||||
|
- for (q = 0; q < ATH9K_NUM_TX_QUEUES; q++)
|
||||||
|
- if (ah->txq[q].tqi_type ==
|
||||||
|
- ATH9K_TX_QUEUE_INACTIVE)
|
||||||
|
- break;
|
||||||
|
- if (q == ATH9K_NUM_TX_QUEUES) {
|
||||||
|
- ath_err(common, "No available TX queue\n");
|
||||||
|
- return -1;
|
||||||
|
- }
|
||||||
|
+ q = qinfo->tqi_subtype;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
ath_err(common, "Invalid TX queue type: %u\n", type);
|
@ -0,0 +1,24 @@ |
|||||||
|
From: Felix Fietkau <nbd@openwrt.org>
|
||||||
|
Date: Sun, 30 Nov 2014 20:34:16 +0100
|
||||||
|
Subject: [PATCH] ath9k: fix BE/BK queue order
|
||||||
|
|
||||||
|
Hardware queues are ordered by priority. Use queue index 0 for BK, which
|
||||||
|
has lower priority than BE.
|
||||||
|
|
||||||
|
Cc: stable@vger.kernel.org
|
||||||
|
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
||||||
|
---
|
||||||
|
|
||||||
|
--- a/drivers/net/wireless/ath/ath9k/hw.h
|
||||||
|
+++ b/drivers/net/wireless/ath/ath9k/hw.h
|
||||||
|
@@ -217,8 +217,8 @@
|
||||||
|
#define AH_WOW_BEACON_MISS BIT(3)
|
||||||
|
|
||||||
|
enum ath_hw_txq_subtype {
|
||||||
|
- ATH_TXQ_AC_BE = 0,
|
||||||
|
- ATH_TXQ_AC_BK = 1,
|
||||||
|
+ ATH_TXQ_AC_BK = 0,
|
||||||
|
+ ATH_TXQ_AC_BE = 1,
|
||||||
|
ATH_TXQ_AC_VI = 2,
|
||||||
|
ATH_TXQ_AC_VO = 3,
|
||||||
|
};
|
Loading…
Reference in new issue