39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Mon, 1 Feb 2021 00:59:14 +0100
|
|
Subject: [PATCH] mac80211: fix station rate table updates on assoc
|
|
|
|
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
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- 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_dereference(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
|
|
@@ -934,7 +934,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));
|
|
|