diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-11-30 19:45:37 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-11-30 19:45:37 +0000 |
| commit | 6847b99be33cee6bb8a7e2a2268a2b369557b037 (patch) | |
| tree | 95171981c095777ce91e11174ea6b7ee276c5743 | |
| parent | 136d947bb74633609cee5c4b524b71906a1b2f8c (diff) | |
| download | upstream-6847b99be33cee6bb8a7e2a2268a2b369557b037.tar.gz upstream-6847b99be33cee6bb8a7e2a2268a2b369557b037.tar.bz2 upstream-6847b99be33cee6bb8a7e2a2268a2b369557b037.zip | |
ath9k: fix hardware tx queue allocation order
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r43438
git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@43439 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/kernel/mac80211/patches/300-pending_work.patch | 57 | ||||
| -rw-r--r-- | package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch | 4 |
2 files changed, 59 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/300-pending_work.patch b/package/kernel/mac80211/patches/300-pending_work.patch index 796b34c97d..10c5cad082 100644 --- a/package/kernel/mac80211/patches/300-pending_work.patch +++ b/package/kernel/mac80211/patches/300-pending_work.patch @@ -1,3 +1,29 @@ +commit 228ee4473b89118993c17ead26381c490c44f9fb +Author: Felix Fietkau <nbd@openwrt.org> +Date: Sun Nov 30 20:34:16 2014 +0100 + + 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> + +commit cae76a90c891c5f96895b9628060449e3deb08c6 +Author: Felix Fietkau <nbd@openwrt.org> +Date: Sun Nov 30 20:30:46 2014 +0100 + + 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> + commit 77980bee5f1f743b46f8749185aca28b8ec69741 Author: Johannes Berg <johannes.berg@intel.com> Date: Mon Nov 3 14:29:09 2014 +0100 @@ -3495,3 +3521,34 @@ Date: Mon May 19 21:20:49 2014 +0200 } void b43_phy_mask(struct b43_wldev *dev, u16 offset, u16 mask) +--- a/drivers/net/wireless/ath/ath9k/hw.h ++++ b/drivers/net/wireless/ath/ath9k/hw.h +@@ -216,8 +216,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, + }; +--- 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/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) { |