Merge "hostapd(hidl): Only enable HT40 for ACS" into pi-dev
diff --git a/hostapd/hidl/1.0/hostapd.cpp b/hostapd/hidl/1.0/hostapd.cpp
index 978cdf1..3cd78b3 100644
--- a/hostapd/hidl/1.0/hostapd.cpp
+++ b/hostapd/hidl/1.0/hostapd.cpp
@@ -167,6 +167,7 @@
return StringPrintf(
"interface=%s\n"
"driver=nl80211\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.
diff --git a/hostapd/main.c b/hostapd/main.c
index 8d90b38..6c0490f 100644
--- a/hostapd/main.c
+++ b/hostapd/main.c
@@ -661,14 +661,8 @@
interfaces.reload_config = hostapd_reload_config;
interfaces.config_read_cb = hostapd_config_read;
interfaces.for_each_interface = hostapd_for_each_interface;
-#ifdef CONFIG_CTRL_IFACE_HIDL
- // No per-netdev setup for HIDL control interface.
- interfaces.ctrl_iface_init = NULL;
- interfaces.ctrl_iface_deinit = NULL;
-#else /* CONFIG_CTRL_IFACE_HIDL */
interfaces.ctrl_iface_init = hostapd_ctrl_iface_init;
interfaces.ctrl_iface_deinit = hostapd_ctrl_iface_deinit;
-#endif /* CONFIG_CTRL_IFACE_HIDL */
interfaces.driver_init = hostapd_driver_init;
interfaces.global_iface_path = NULL;
interfaces.global_iface_name = NULL;
@@ -908,9 +902,8 @@
wpa_printf(MSG_ERROR, "Failed to initialize HIDL interface");
goto out;
}
-#else /* CONFIG_CTRL_IFACE_HIDL */
- hostapd_global_ctrl_iface_init(&interfaces);
#endif /* CONFIG_CTRL_IFACE_HIDL */
+ hostapd_global_ctrl_iface_init(&interfaces);
if (hostapd_global_run(&interfaces, daemonize, pid_file)) {
wpa_printf(MSG_ERROR, "Failed to start eloop");
@@ -922,9 +915,8 @@
out:
#ifdef CONFIG_CTRL_IFACE_HIDL
hostapd_hidl_deinit(&interfaces);
-#else /* CONFIG_CTRL_IFACE_HIDL */
- hostapd_global_ctrl_iface_deinit(&interfaces);
#endif /* CONFIG_CTRL_IFACE_HIDL */
+ hostapd_global_ctrl_iface_deinit(&interfaces);
/* Deinitialize all interfaces */
for (i = 0; i < interfaces.count; i++) {
if (!interfaces.iface[i])