diff options
| author | Shaul Triebitz <shaul.triebitz@intel.com> | 2022-07-24 11:07:32 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2022-08-25 10:40:48 +0200 |
| commit | a8f62399daa6917e7f9efeb79bce4dd2cd494a1e (patch) | |
| tree | 850ac0432523123255d02607788e5d0448e88d59 /net/mac80211/sta_info.c | |
| parent | b303835dabe0340f932ebb4e260d2229f79b0684 (diff) | |
| download | linux-a8f62399daa6917e7f9efeb79bce4dd2cd494a1e.tar.bz2 | |
wifi: mac80211: properly set old_links when removing a link
In ieee80211_sta_remove_link, valid_links is set to
the new_links before calling drv_change_sta_links, but
is used for the old_links.
Fixes: cb71f1d136a6 ("wifi: mac80211: add sta link addition/removal")
Signed-off-by: Shaul Triebitz <shaul.triebitz@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/sta_info.c')
| -rw-r--r-- | net/mac80211/sta_info.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index cb23da9aff1e..05dc56811cb4 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -2799,6 +2799,7 @@ hash: void ieee80211_sta_remove_link(struct sta_info *sta, unsigned int link_id) { struct ieee80211_sub_if_data *sdata = sta->sdata; + u16 old_links = sta->sta.valid_links; lockdep_assert_held(&sdata->local->sta_mtx); @@ -2806,8 +2807,7 @@ void ieee80211_sta_remove_link(struct sta_info *sta, unsigned int link_id) if (test_sta_flag(sta, WLAN_STA_INSERTED)) drv_change_sta_links(sdata->local, sdata, &sta->sta, - sta->sta.valid_links, - sta->sta.valid_links & ~BIT(link_id)); + old_links, sta->sta.valid_links); sta_remove_link(sta, link_id, true); } |