aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2023-02-24 22:03:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2023-02-24 22:03:14 +0000
commit5bfd856ae429641acd84451a1d69415cf62dac8e (patch)
tree291ee52b4a399a32677b6d35279df65493997e26
parent77d572f14330ddd3d38e2d5233475e1100ad45b1 (diff)
parent9d0d5215f1e26a731798a692a77e04f647037166 (diff)
downloadwpa_supplicant_8-5bfd856ae429641acd84451a1d69415cf62dac8e.tar.gz
Merge "Do AIDL initialization after daemonizing the process" into udc-dev
-rw-r--r--hostapd/main.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/hostapd/main.c b/hostapd/main.c
index eb1e861a..18b2dd97 100644
--- a/hostapd/main.c
+++ b/hostapd/main.c
@@ -448,6 +448,13 @@ static int hostapd_global_run(struct hapd_interfaces *ifaces, int daemonize,
}
}
+#ifdef CONFIG_CTRL_IFACE_AIDL
+ if (hostapd_aidl_init(ifaces)) {
+ wpa_printf(MSG_ERROR, "Failed to initialize AIDL interface");
+ return -1;
+ }
+#endif /* CONFIG_CTRL_IFACE_AIDL */
+
eloop_run();
return 0;
@@ -898,12 +905,6 @@ int main(int argc, char *argv[])
goto out;
}
-#ifdef CONFIG_CTRL_IFACE_AIDL
- if (hostapd_aidl_init(&interfaces)) {
- wpa_printf(MSG_ERROR, "Failed to initialize AIDL interface");
- goto out;
- }
-#endif /* CONFIG_CTRL_IFACE_AIDL */
hostapd_global_ctrl_iface_init(&interfaces);
if (hostapd_global_run(&interfaces, daemonize, pid_file)) {