summaryrefslogtreecommitdiff
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2025-03-08 23:03:40 +0200
committerJohannes Berg <johannes.berg@intel.com>2025-03-11 10:53:11 +0100
commitc3171bed65ec323803b6b73f74017f7d0fd7aa6c (patch)
treee9001c1cfaa169476cb92f178b470ceba0f9a09c /net/mac80211
parent82306ea157ad5d1dc8126f81a989e61bf1001c0d (diff)
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>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/ieee80211_i.h2
-rw-r--r--net/mac80211/mlme.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index a36563a07b3b..217e949bb756 100644
--- 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 9c4d4f04b23e..94d9d9ca42fe 100644
--- 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;