diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-05-02 23:20:40 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-05-04 01:07:17 +0200 |
| commit | 1b5a45a4a74732fc7d17911a12d178517292cc5b (patch) | |
| tree | 1284382c50b324d43d10fc966fe3f80e63665b02 /package/kernel/mac80211/patches/subsys/372-mac80211-fix-station-rate-table-updates-on-assoc.patch | |
| parent | a883e3af386a6aef80fae14facbf1981eb8e91bc (diff) | |
| download | upstream-1b5a45a4a74732fc7d17911a12d178517292cc5b.tar.gz upstream-1b5a45a4a74732fc7d17911a12d178517292cc5b.tar.bz2 upstream-1b5a45a4a74732fc7d17911a12d178517292cc5b.zip | |
mac80211: Update to backports version 4.19.189-1
The removed patches were applied upstream.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/subsys/372-mac80211-fix-station-rate-table-updates-on-assoc.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/subsys/372-mac80211-fix-station-rate-table-updates-on-assoc.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/package/kernel/mac80211/patches/subsys/372-mac80211-fix-station-rate-table-updates-on-assoc.patch b/package/kernel/mac80211/patches/subsys/372-mac80211-fix-station-rate-table-updates-on-assoc.patch deleted file mode 100644 index 693904b495..0000000000 --- a/package/kernel/mac80211/patches/subsys/372-mac80211-fix-station-rate-table-updates-on-assoc.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 1d3a84f92f75bb0c2f981a75f507f55afed12f2c Mon Sep 17 00:00:00 2001 -From: Felix Fietkau <nbd@nbd.name> -Date: Mon, 1 Feb 2021 09:33:24 +0100 -Subject: [PATCH] mac80211: fix station rate table updates on assoc - -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 -@@ -128,8 +128,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 -@@ -941,7 +941,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)); - |