wifi: mac80211: fix warning on disconnect during failed ML reconf

[ Upstream commit 0e104aa3676d020f6c442cd7fbaeb72adaaab6fc ]

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

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 676274519cdfbf95e16b8cb1fe0dd8400b867c08..3f30c4c1f78bb592846744c2267fcb127512b64a 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -4298,7 +4298,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;