]>
Commit | Line | Data |
---|---|---|
c5504877 GKH |
1 | From ad8fdccf9c197a89e2d2fa78c453283dcc2c343f Mon Sep 17 00:00:00 2001 |
2 | From: Felix Fietkau <nbd@openwrt.org> | |
3 | Date: Sun, 30 Nov 2014 20:38:40 +0100 | |
4 | Subject: ath9k_hw: fix hardware queue allocation | |
5 | ||
6 | From: Felix Fietkau <nbd@openwrt.org> | |
7 | ||
8 | commit ad8fdccf9c197a89e2d2fa78c453283dcc2c343f upstream. | |
9 | ||
10 | The driver passes the desired hardware queue index for a WMM data queue | |
11 | in qinfo->tqi_subtype. This was ignored in ath9k_hw_setuptxqueue, which | |
12 | instead relied on the order in which the function is called. | |
13 | ||
14 | Reported-by: Hubert Feurstein <h.feurstein@gmail.com> | |
15 | Signed-off-by: Felix Fietkau <nbd@openwrt.org> | |
16 | Signed-off-by: John W. Linville <linville@tuxdriver.com> | |
17 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
18 | ||
19 | --- | |
20 | drivers/net/wireless/ath/ath9k/mac.c | 9 +-------- | |
21 | 1 file changed, 1 insertion(+), 8 deletions(-) | |
22 | ||
23 | --- a/drivers/net/wireless/ath/ath9k/mac.c | |
24 | +++ b/drivers/net/wireless/ath/ath9k/mac.c | |
25 | @@ -311,14 +311,7 @@ int ath9k_hw_setuptxqueue(struct ath_hw | |
26 | q = ATH9K_NUM_TX_QUEUES - 3; | |
27 | break; | |
28 | case ATH9K_TX_QUEUE_DATA: | |
29 | - for (q = 0; q < ATH9K_NUM_TX_QUEUES; q++) | |
30 | - if (ah->txq[q].tqi_type == | |
31 | - ATH9K_TX_QUEUE_INACTIVE) | |
32 | - break; | |
33 | - if (q == ATH9K_NUM_TX_QUEUES) { | |
34 | - ath_err(common, "No available TX queue\n"); | |
35 | - return -1; | |
36 | - } | |
37 | + q = qinfo->tqi_subtype; | |
38 | break; | |
39 | default: | |
40 | ath_err(common, "Invalid TX queue type: %u\n", type); |