wifi: mac80211: fix warning on disconnect during failed ML reconf
authorJohannes Berg <johannes.berg@intel.com>
Sat, 8 Mar 2025 21:03:36 +0000 (23:03 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 11 Mar 2025 09:53:10 +0000 (10:53 +0100)
If multi-link reconfiguration fails, we can disconnect with a local link
already allocated but the BSS entry not assigned yet, which leads to a
warning in cfg80211. Add a check to avoid the warning.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250308225541.699bd9cbabe5.I599d5ff69092a65e916e2acd25137ae9df8debe8@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/mlme.c

index 85ae6619767416d1b465c59822bce93e208c926e..f3bf66d4ce6af5bb7930b7649e8084e532751294 100644 (file)
@@ -4466,7 +4466,7 @@ static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata)
                        struct ieee80211_link_data *link;
 
                        link = sdata_dereference(sdata->link[link_id], sdata);
-                       if (!link)
+                       if (!link || !link->conf->bss)
                                continue;
                        cfg80211_unlink_bss(local->hw.wiphy, link->conf->bss);
                        link->conf->bss = NULL;