wifi: mac80211: don't include MLE in ML reconf per-STA profile

[ Upstream commit c3171bed65ec323803b6b73f74017f7d0fd7aa6c ]

In the multi-link reconfiguration frame, the per-STA profile for
added links shouldn't include the multi-link element. Set the
association ID to an invalid value, so it doesn't erroneously
match the link ID if that happens to be zero.

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.8e5be244c70f.I3472cd5c347814ee3600869a88488997bcd43224@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index e7dc3f0cfc9a9aa8e5ba228515f13342b8d90118..8f5f7797f0b6b54591f3042aa105c9f5fe36f0f3 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -462,7 +462,7 @@ struct ieee80211_mgd_assoc_data {
        bool s1g;
        bool spp_amsdu;
 
-       unsigned int assoc_link_id;
+       s8 assoc_link_id;
 
        u8 fils_nonces[2 * FILS_NONCE_LEN];
        u8 fils_kek[FILS_MAX_KEK_LEN];

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index e3deb89674b23dd39da45026a98962535ac25592..676274519cdfbf95e16b8cb1fe0dd8400b867c08 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -10156,6 +10156,8 @@ int ieee80211_mgd_assoc_ml_reconf(struct ieee80211_sub_if_data *sdata,
                if (!data)
                        return -ENOMEM;
 
+               data->assoc_link_id = -1;
+
                uapsd_supported = true;
                ieee80211_ml_reconf_selectors(userspace_selectors);
                for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS;