Revert "[wpa_supplicant] cumilative patch from commit 4b755c967"
Revert submission 26533062-Supplicant_merge_June24
Reason for revert: https://b.corp.google.com/issues/349780869
Reverted changes: /q/submissionid:26533062-Supplicant_merge_June24
Change-Id: I6c9b7a4323fa7edde47617da6c1e0d8f6e6d5101
diff --git a/src/ap/beacon.c b/src/ap/beacon.c
index 32865f6..e50f0a0 100644
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
@@ -960,7 +960,7 @@
* We want to include the AP MLD ID in the response if it was
* included in the request.
*/
- probed_mld_id = mld_id != -1 ? mld_id : hostapd_get_mld_id(hapd);
+ probed_mld_id = mld_id != -1 ? mld_id : hapd->conf->mld_id;
for_each_mld_link(link, i, j, hapd->iface->interfaces,
probed_mld_id) {
@@ -2616,8 +2616,7 @@
hostapd_get_oper_centr_freq_seg1_idx(iconf),
cmode->vht_capab,
&cmode->he_capab[IEEE80211_MODE_AP],
- &cmode->eht_capab[IEEE80211_MODE_AP],
- hostapd_get_punct_bitmap(hapd)) == 0)
+ &cmode->eht_capab[IEEE80211_MODE_AP]) == 0)
params.freq = &freq;
for (i = 0; i < hapd->iface->num_hw_features; i++) {
@@ -2676,7 +2675,8 @@
continue;
#ifdef CONFIG_IEEE80211BE
- if (hostapd_is_ml_partner(hapd, other->bss[0]))
+ if (hapd->conf->mld_ap && other->bss[0]->conf->mld_ap &&
+ hapd->conf->mld_id == other->bss[0]->conf->mld_id)
mld_ap = true;
#endif /* CONFIG_IEEE80211BE */