diff options
| author |   Felix Fietkau <nbd@openwrt.org> | 2014-11-30 20:38:40 +0100 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2014-12-01 15:57:21 -0500 |
| commit | ad8fdccf9c197a89e2d2fa78c453283dcc2c343f (patch) | |
| tree | 76ad9f4ca1fe6282bcceeb858e8baae1018b99d5 /drivers/net/wireless/ath/ath9k/mac.c | |
| parent | brcmsmac: NULL dereferences in brcms_c_detach_mfree() (diff) | |
| download | linux-dev-ad8fdccf9c197a89e2d2fa78c453283dcc2c343f.tar.xz linux-dev-ad8fdccf9c197a89e2d2fa78c453283dcc2c343f.zip | |
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>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/mac.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/mac.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c index 275205ab5f15..3e58bfa0c1fd 100644 --- 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 *ah, enum ath9k_tx_queue type, 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); |