lkml.org 
[lkml]   [2015]   [Apr]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 049/176] ath5k: fix hardware queue index assignment
    Date
    From: Felix Fietkau <nbd@openwrt.org>

    3.4.107-rc1 review patch. If anyone has any objections, please let me know.

    ------------------


    commit 9e4982f6a51a2442f1bb588fee42521b44b4531c upstream.

    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.

    Signed-off-by: Felix Fietkau <nbd@openwrt.org>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Zefan Li <lizefan@huawei.com>
    ---
    drivers/net/wireless/ath/ath5k/qcu.c | 8 +-------
    1 file changed, 1 insertion(+), 7 deletions(-)

    diff --git a/drivers/net/wireless/ath/ath5k/qcu.c b/drivers/net/wireless/ath/ath5k/qcu.c
    index 30b50f9..19ba204 100644
    --- a/drivers/net/wireless/ath/ath5k/qcu.c
    +++ b/drivers/net/wireless/ath/ath5k/qcu.c
    @@ -223,13 +223,7 @@ ath5k_hw_setup_tx_queue(struct ath5k_hw *ah, enum ath5k_tx_queue queue_type,
    } else {
    switch (queue_type) {
    case AR5K_TX_QUEUE_DATA:
    - for (queue = AR5K_TX_QUEUE_ID_DATA_MIN;
    - ah->ah_txq[queue].tqi_type !=
    - AR5K_TX_QUEUE_INACTIVE; queue++) {
    -
    - if (queue > AR5K_TX_QUEUE_ID_DATA_MAX)
    - return -EINVAL;
    - }
    + queue = queue_info->tqi_subtype;
    break;
    case AR5K_TX_QUEUE_UAPSD:
    queue = AR5K_TX_QUEUE_ID_UAPSD;
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-04-09 12:41    [W:5.169 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site