wifi: mac80211: properly set old_links when removing a link

[ Upstream commit a8f62399daa6917e7f9efeb79bce4dd2cd494a1e ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 58998d8217784890c5221ed160c243ae550b0466..9d7b238a67372eecf5660ef3b55d473f1b5cda33 100644 (file)
--- 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);
 }