lkml.org 
[lkml]   [2021]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 057/120] mac80211: fix station rate table updates on assoc
    Date
    From: Felix Fietkau <nbd@nbd.name>

    commit 18fe0fae61252b5ae6e26553e2676b5fac555951 upstream.

    If the driver uses .sta_add, station entries are only uploaded after the sta
    is in assoc state. Fix early station rate table updates by deferring them
    until the sta has been uploaded.

    Cc: stable@vger.kernel.org
    Signed-off-by: Felix Fietkau <nbd@nbd.name>
    Link: https://lore.kernel.org/r/20210201083324.3134-1-nbd@nbd.name
    [use rcu_access_pointer() instead since we won't dereference here]
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/mac80211/driver-ops.c | 5 ++++-
    net/mac80211/rate.c | 3 ++-
    2 files changed, 6 insertions(+), 2 deletions(-)

    --- a/net/mac80211/driver-ops.c
    +++ b/net/mac80211/driver-ops.c
    @@ -125,8 +125,11 @@ int drv_sta_state(struct ieee80211_local
    } else if (old_state == IEEE80211_STA_AUTH &&
    new_state == IEEE80211_STA_ASSOC) {
    ret = drv_sta_add(local, sdata, &sta->sta);
    - if (ret == 0)
    + if (ret == 0) {
    sta->uploaded = true;
    + if (rcu_access_pointer(sta->sta.rates))
    + drv_sta_rate_tbl_update(local, sdata, &sta->sta);
    + }
    } else if (old_state == IEEE80211_STA_ASSOC &&
    new_state == IEEE80211_STA_AUTH) {
    drv_sta_remove(local, sdata, &sta->sta);
    --- a/net/mac80211/rate.c
    +++ b/net/mac80211/rate.c
    @@ -960,7 +960,8 @@ int rate_control_set_rates(struct ieee80
    if (old)
    kfree_rcu(old, rcu_head);

    - drv_sta_rate_tbl_update(hw_to_local(hw), sta->sdata, pubsta);
    + if (sta->uploaded)
    + drv_sta_rate_tbl_update(hw_to_local(hw), sta->sdata, pubsta);

    ieee80211_sta_set_expected_throughput(pubsta, sta_get_expected_throughput(sta));


    \
     
     \ /
      Last update: 2021-02-08 18:15    [W:5.309 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site