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

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>

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index a36563a07b3b04c249e2352624c1fecc7b6fbd93..217e949bb756c52cf343d3ea34798b1d9ee7731c 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -460,7 +460,7 @@ struct ieee80211_mgd_assoc_data {
        bool s1g;
        bool spp_amsdu;
 
-       unsigned int assoc_link_id;
+       s8 assoc_link_id;
 
        __le16 ext_mld_capa_ops;
 

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 9c4d4f04b23eb9df02ea3454777e700ed1b8a063..94d9d9ca42feea8e7e0691a6c29ecc1d3066de2d 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -10434,6 +10434,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;