| From: Felix Fietkau <nbd@openwrt.org> |
| Date: Sun, 30 Nov 2014 20:38:40 +0100 |
| Subject: ath9k_hw: fix hardware queue allocation |
| |
| commit ad8fdccf9c197a89e2d2fa78c453283dcc2c343f upstream. |
| |
| 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. |
| |
| Reported-by: Hubert Feurstein <h.feurstein@gmail.com> |
| Signed-off-by: Felix Fietkau <nbd@openwrt.org> |
| Signed-off-by: John W. Linville <linville@tuxdriver.com> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/net/wireless/ath/ath9k/mac.c | 9 +-------- |
| 1 file changed, 1 insertion(+), 8 deletions(-) |
| |
| --- 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); |
