Snap for 13088830 from aaf2f4bf06196d744a85c47961a96dbbfb606cc3 to 25Q2-release
Change-Id: I713a65bcdc3afface3a126551e8fab5f5948f5cf
diff --git a/hostapd/aidl/hostapd.cpp b/hostapd/aidl/hostapd.cpp
index 412919c..06bc90d 100644
--- a/hostapd/aidl/hostapd.cpp
+++ b/hostapd/aidl/hostapd.cpp
@@ -881,7 +881,7 @@
"%s\n"
"interface=%s\n"
"driver=nl80211\n"
- "ctrl_interface=/data/vendor/wifi/hostapd/ctrl_%s\n"
+ "ctrl_interface=/data/vendor/wifi/hostapd/ctrl\n"
// ssid2 signals to hostapd that the value is not a literal value
// for use as a SSID. In this case, we're giving it a hex
// std::string and hostapd needs to expect that.
@@ -907,7 +907,6 @@
"%s\n",
sanitized_overlay.c_str(),
iface_params.usesMlo ? br_name.c_str() : iface_params.name.c_str(),
- iface_params.name.c_str(),
ssid_as_string.c_str(),
channel_config_as_string.c_str(),
iface_params.hwModeParams.enable80211N ? 1 : 0,
diff --git a/wpa_supplicant/Android.bp b/wpa_supplicant/Android.bp
index 1e8e627..ea97188 100644
--- a/wpa_supplicant/Android.bp
+++ b/wpa_supplicant/Android.bp
@@ -913,6 +913,12 @@
}) + select(soong_config_variable("wpa_supplicant_8", "wifi_brcm_open_source_multi_akm"), {
true: ["-DWIFI_BRCM_OPEN_SOURCE_MULTI_AKM"],
default: [],
+ }) + select(soong_config_variable("wpa_supplicant_8", "wpa_supplicant_11ax"), {
+ true: ["-DCONFIG_IEEE80211AX"],
+ default: [],
+ }) + select(soong_config_variable("wpa_supplicant_8", "wpa_supplicant_11be"), {
+ true: ["-DCONFIG_IEEE80211BE"],
+ default: [],
}),
arch: {
arm: {