Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e4982f6 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath5k: fix hardware queue index assignment 



Like with ath9k, ath5k queues also need to be ordered by priority.
queue_info->tqi_subtype already contains the correct index, so use it
instead of relying on the order of ath5k_hw_setup_tx_queue calls.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 78063d81

drivers/net/wireless/ath/ath5k/qcu.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -225,13 +225,7 @@ ath5k_hw_setup_tx_queue(struct ath5k_hw *ah, enum ath5k_tx_queue queue_type, 
	} else {

	} else {

		switch (queue_type) {

		switch (queue_type) {

		case AR5K_TX_QUEUE_DATA:

		case AR5K_TX_QUEUE_DATA:

			for (queue = AR5K_TX_QUEUE_ID_DATA_MIN;

			queue = queue_info->tqi_subtype;

				ah->ah_txq[queue].tqi_type !=

				AR5K_TX_QUEUE_INACTIVE; queue++) {



				if (queue > AR5K_TX_QUEUE_ID_DATA_MAX)

					return -EINVAL;

			}

			break;

			break;

		case AR5K_TX_QUEUE_UAPSD:

		case AR5K_TX_QUEUE_UAPSD:

			queue = AR5K_TX_QUEUE_ID_UAPSD;

			queue = AR5K_TX_QUEUE_ID_UAPSD;