]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: mac80211: remove SSID from ML reconf
authorJohannes Berg <johannes.berg@intel.com>
Tue, 11 Mar 2025 11:10:03 +0000 (12:10 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 12 Mar 2025 08:50:18 +0000 (09:50 +0100)
The ML reconfiguration frame shouldn't contain an SSID,
remove it.

Fixes: 36e05b0b8390 ("wifi: mac80211: Support dynamic link addition and removal")
Reviewed-by: Ilan Peer <ilan.peer@intel.com>
Link: https://patch.msgid.link/20250311121004.fdf08f90bc30.I07f88d3a6f592a0df65d48f55d65c46a4d261007@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/mlme.c

index bfd3653a5b847cfde6faf4851e6d4cfd06182741..3dae02345ab8e13adbaa5a3c0234d1440e10b9ce 100644 (file)
@@ -10233,8 +10233,8 @@ ieee80211_build_ml_reconf_req(struct ieee80211_sub_if_data *sdata,
                size += 2 + sizeof(struct ieee80211_mle_per_sta_profile) +
                        ETH_ALEN;
 
-               /* SSID element + WMM */
-               size += 2 + sdata->vif.cfg.ssid_len + 9;
+               /* WMM */
+               size += 9;
                size += ieee80211_link_common_elems_size(sdata, iftype, cbss,
                                                         elems_len);
        }
@@ -10346,11 +10346,6 @@ ieee80211_build_ml_reconf_req(struct ieee80211_sub_if_data *sdata,
 
                        capab_pos = skb_put(skb, 2);
 
-                       skb_put_u8(skb, WLAN_EID_SSID);
-                       skb_put_u8(skb, sdata->vif.cfg.ssid_len);
-                       skb_put_data(skb, sdata->vif.cfg.ssid,
-                                    sdata->vif.cfg.ssid_len);
-
                        extra_used =
                                ieee80211_add_link_elems(sdata, skb, &capab, NULL,
                                                         add_links_data->link[link_id].elems,