lkml.org 
[lkml]   [2015]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 004/176] ath9k_hw: fix hardware queue allocation
    Date
    From: Felix Fietkau <nbd@openwrt.org>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    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: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/net/wireless/ath/ath9k/mac.c | 9 +--------
    1 file changed, 1 insertion(+), 8 deletions(-)

    diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c
    index a3eff0986a3f..02446801cb3a 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);
    --
    2.2.2


    \
     
     \ /
      Last update: 2015-01-29 10:21    [W:4.072 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site