diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-11-30 19:41:59 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-11-30 19:41:59 +0000 |
| commit | 9178792bcb155307f280abea26b5dbe980d52e73 (patch) | |
| tree | 794e9545a44d1dad735aaef09f304f876297d1b4 /package/kernel/mac80211 | |
| parent | 1069e426d598fe6e079471d0412ccdd6a93d29d6 (diff) | |
| download | upstream-9178792bcb155307f280abea26b5dbe980d52e73.tar.gz upstream-9178792bcb155307f280abea26b5dbe980d52e73.tar.bz2 upstream-9178792bcb155307f280abea26b5dbe980d52e73.zip | |
ath9k: fix hardware tx queue allocation order
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43438 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211')
3 files changed, 57 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/324-ath9k_hw-fix-hardware-queue-allocation.patch b/package/kernel/mac80211/patches/324-ath9k_hw-fix-hardware-queue-allocation.patch new file mode 100644 index 0000000000..8eba1f2720 --- /dev/null +++ b/package/kernel/mac80211/patches/324-ath9k_hw-fix-hardware-queue-allocation.patch @@ -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); diff --git a/package/kernel/mac80211/patches/325-ath9k-fix-BE-BK-queue-order.patch b/package/kernel/mac80211/patches/325-ath9k-fix-BE-BK-queue-order.patch new file mode 100644 index 0000000000..3087b0c6da --- /dev/null +++ b/package/kernel/mac80211/patches/325-ath9k-fix-BE-BK-queue-order.patch @@ -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, + }; diff --git a/package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch b/package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch index a521525a1b..b01555c321 100644 --- a/package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch +++ b/package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/mac.c +++ b/drivers/net/wireless/ath/ath9k/mac.c -@@ -700,7 +700,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw +@@ -693,7 +693,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw { #define AH_RX_STOP_DMA_TIMEOUT 10000 /* usec */ struct ath_common *common = ath9k_hw_common(ah); @@ -9,7 +9,7 @@ int i; /* Enable access to the DMA observation bus */ -@@ -730,6 +730,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw +@@ -723,6 +723,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw } if (i == 0) { |