Revert "Revert "[wpa_supplicant] cumilative patch from commit 3a..."
Revert submission 28102966-revert-26533062-Supplicant_merge_June24-CUATTSRBBR
Reason for revert: Fixed the regression issue (ag/28389573)
Reverted changes: /q/submissionid:28102966-revert-26533062-Supplicant_merge_June24-CUATTSRBBR
Bug: 329004037
Test: Turn ON/OFF SoftAp multiple times
Change-Id: Ibfff2a847be5678f1a6d77e28506a05936812a91
diff --git a/hostapd/main.c b/hostapd/main.c
index 615dc2f..0fe2d74 100644
--- a/hostapd/main.c
+++ b/hostapd/main.c
@@ -249,8 +249,12 @@
* Use the configured MLD MAC address as the interface hardware address
* if this AP is a part of an AP MLD.
*/
- if (!is_zero_ether_addr(hapd->conf->mld_addr) && hapd->conf->mld_ap)
- params.bssid = hapd->conf->mld_addr;
+ if (hapd->conf->mld_ap) {
+ if (!is_zero_ether_addr(hapd->conf->mld_addr))
+ params.bssid = hapd->conf->mld_addr;
+ else
+ params.bssid = NULL;
+ }
#endif /* CONFIG_IEEE80211BE */
params.ifname = hapd->conf->iface;
@@ -340,6 +344,9 @@
return -1;
}
+ /* Initialize the BSS parameter change to 1 */
+ hapd->eht_mld_bss_param_change = 1;
+
wpa_printf(MSG_DEBUG,
"MLD: Set link_id=%u, mld_addr=" MACSTR
", own_addr=" MACSTR,