Revert "[wpa_supplicant] cumilative patch from commit 3a5d1a7e6"
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: I4a7a5b8ccb6b4822353bacc29649587cd5a3cb80
diff --git a/hostapd/main.c b/hostapd/main.c
index 0fe2d74..615dc2f 100644
--- a/hostapd/main.c
+++ b/hostapd/main.c
@@ -249,12 +249,8 @@
* Use the configured MLD MAC address as the interface hardware address
* if this AP is a part of an AP MLD.
*/
- if (hapd->conf->mld_ap) {
- if (!is_zero_ether_addr(hapd->conf->mld_addr))
- params.bssid = hapd->conf->mld_addr;
- else
- params.bssid = NULL;
- }
+ if (!is_zero_ether_addr(hapd->conf->mld_addr) && hapd->conf->mld_ap)
+ params.bssid = hapd->conf->mld_addr;
#endif /* CONFIG_IEEE80211BE */
params.ifname = hapd->conf->iface;
@@ -344,9 +340,6 @@
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,