lkml.org 
[lkml]   [2020]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 84/91] mac80211: minstrel: fix tx status processing corner case
    Date
    From: Felix Fietkau <nbd@nbd.name>

    commit b2911a84396f72149dce310a3b64d8948212c1b3 upstream.

    Some drivers fill the status rate list without setting the rate index after
    the final rate to -1. minstrel_ht already deals with this, but minstrel
    doesn't, which causes it to get stuck at the lowest rate on these drivers.

    Fix this by checking the count as well.

    Cc: stable@vger.kernel.org
    Fixes: cccf129f820e ("mac80211: add the 'minstrel' rate control algorithm")
    Signed-off-by: Felix Fietkau <nbd@nbd.name>
    Link: https://lore.kernel.org/r/20201111183359.43528-3-nbd@nbd.name
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/mac80211/rc80211_minstrel.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/net/mac80211/rc80211_minstrel.c
    +++ b/net/mac80211/rc80211_minstrel.c
    @@ -276,7 +276,7 @@ minstrel_tx_status(void *priv, struct ie
    success = !!(info->flags & IEEE80211_TX_STAT_ACK);

    for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
    - if (ar[i].idx < 0)
    + if (ar[i].idx < 0 || !ar[i].count)
    break;

    ndx = rix_to_ndx(mi, ar[i].idx);

    \
     
     \ /
      Last update: 2020-11-23 13:39    [W:4.135 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site