diff options
author | Jakub Kicinski <kuba@kernel.org> | 2020-11-02 09:43:54 -0800 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2020-11-02 09:43:54 -0800 |
commit | 04a55c944f151b3149b78beff5ff406faa84485d (patch) | |
tree | 014f6b7e62ac639f43a3b75cb5daaab9d58a51f9 /net/mac80211/sta_info.c | |
parent | 859191b234f86b5f36cbe384baca1067a2221eb7 (diff) | |
parent | c2f46814521113f6699a74e0a0424cbc5b305479 (diff) | |
download | linux-04a55c944f151b3149b78beff5ff406faa84485d.tar.gz linux-04a55c944f151b3149b78beff5ff406faa84485d.tar.bz2 linux-04a55c944f151b3149b78beff5ff406faa84485d.zip |
Merge tag 'mac80211-for-net-2020-10-30' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
A couple of fixes, for
* HE on 2.4 GHz
* a few issues syzbot found, but we have many more reports :-(
* a regression in nl80211-transported EAPOL frames which had
affected a number of users, from Mathy
* kernel-doc markings in mac80211, from Mauro
* a format argument in reg.c, from Ye Bin
====================
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/mac80211/sta_info.c')
-rw-r--r-- | net/mac80211/sta_info.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index fb4f2b9b294f..4fe284ff1ea3 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -258,6 +258,24 @@ struct sta_info *sta_info_get_by_idx(struct ieee80211_sub_if_data *sdata, */ void sta_info_free(struct ieee80211_local *local, struct sta_info *sta) { + /* + * If we had used sta_info_pre_move_state() then we might not + * have gone through the state transitions down again, so do + * it here now (and warn if it's inserted). + * + * This will clear state such as fast TX/RX that may have been + * allocated during state transitions. + */ + while (sta->sta_state > IEEE80211_STA_NONE) { + int ret; + + WARN_ON_ONCE(test_sta_flag(sta, WLAN_STA_INSERTED)); + + ret = sta_info_move_state(sta, sta->sta_state - 1); + if (WARN_ONCE(ret, "sta_info_move_state() returned %d\n", ret)) + break; + } + if (sta->rate_ctrl) rate_control_free_sta(sta); |