Revert "Cumulative patch from commit a9491695b30a7f750dc45cb563d813b03f1d4b8d"
This reverts commit bbcc4391bed89e8cd0dd235760cd2983f65721cf.
Bug: 34869019
Test: Load image and start soft AP
Change-Id: I85f39c134c1321d6a78f9f25a34f71ad7b1173fb
diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index ec2d55a..9a14be4 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -952,10 +952,6 @@
L_CFLAGS += -DCONFIG_NO_STDOUT_DEBUG
endif
-ifdef CONFIG_DEBUG_SYSLOG
-L_CFLAGS += -DCONFIG_DEBUG_SYSLOG
-endif
-
ifdef CONFIG_DEBUG_LINUX_TRACING
L_CFLAGS += -DCONFIG_DEBUG_LINUX_TRACING
endif
diff --git a/hostapd/Makefile b/hostapd/Makefile
index d9bb72a..52c72dc 100644
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -997,10 +997,6 @@
CFLAGS += -DCONFIG_NO_STDOUT_DEBUG
endif
-ifdef CONFIG_DEBUG_SYSLOG
-CFLAGS += -DCONFIG_DEBUG_SYSLOG
-endif
-
ifdef CONFIG_DEBUG_LINUX_TRACING
CFLAGS += -DCONFIG_DEBUG_LINUX_TRACING
endif
diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index 62feaa4..6b4aa05 100644
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -1070,9 +1070,7 @@
nei_pos > nei_rep ? nei_rep : NULL,
nei_pos - nei_rep, mbo_len ? mbo : NULL,
mbo_len);
-#ifdef CONFIG_MBO
fail:
-#endif /* CONFIG_MBO */
os_free(url);
return ret;
}
diff --git a/hostapd/defconfig b/hostapd/defconfig
index bf6e646..e25ec32 100644
--- a/hostapd/defconfig
+++ b/hostapd/defconfig
@@ -166,9 +166,6 @@
# Disabled by default.
#CONFIG_DEBUG_FILE=y
-# Send debug messages to syslog instead of stdout
-#CONFIG_DEBUG_SYSLOG=y
-
# Add support for sending all debug messages (regardless of debug verbosity)
# to the Linux kernel tracing facility. This helps debug the entire stack by
# making it easy to record everything happening from the driver up into the
diff --git a/hostapd/main.c b/hostapd/main.c
index 593267c..6911232 100644
--- a/hostapd/main.c
+++ b/hostapd/main.c
@@ -108,10 +108,6 @@
module_str ? module_str : "",
module_str ? ": " : "", txt);
-#ifdef CONFIG_DEBUG_SYSLOG
- if (wpa_debug_syslog)
- conf_stdout = 0;
-#endif /* CONFIG_DEBUG_SYSLOG */
if ((conf_stdout & module) && level >= conf_stdout_level) {
wpa_debug_print_timestamp();
wpa_printf(MSG_INFO, "%s", format);
@@ -488,9 +484,6 @@
" (records all messages regardless of debug verbosity)\n"
#endif /* CONFIG_DEBUG_LINUX_TRACING */
" -i list of interface names to use\n"
-#ifdef CONFIG_DEBUG_SYSLOG
- " -s log output to syslog instead of stdout\n"
-#endif /* CONFIG_DEBUG_SYSLOG */
" -S start all the interfaces synchronously\n"
" -t include timestamps in some debug messages\n"
" -v show hostapd version\n");
@@ -668,7 +661,7 @@
dl_list_init(&interfaces.global_ctrl_dst);
for (;;) {
- c = getopt(argc, argv, "b:Bde:f:hi:KP:sSTtu:vg:G:");
+ c = getopt(argc, argv, "b:Bde:f:hi:KP:STtu:vg:G:");
if (c < 0)
break;
switch (c) {
@@ -725,11 +718,6 @@
bss_config = tmp_bss;
bss_config[num_bss_configs++] = optarg;
break;
-#ifdef CONFIG_DEBUG_SYSLOG
- case 's':
- wpa_debug_syslog = 1;
- break;
-#endif /* CONFIG_DEBUG_SYSLOG */
case 'S':
start_ifaces_in_sync = 1;
break;
@@ -758,10 +746,6 @@
wpa_debug_open_file(log_file);
else
wpa_debug_setup_stdout();
-#ifdef CONFIG_DEBUG_SYSLOG
- if (wpa_debug_syslog)
- wpa_debug_open_syslog();
-#endif /* CONFIG_DEBUG_SYSLOG */
#ifdef CONFIG_DEBUG_LINUX_TRACING
if (enable_trace_dbg) {
int tret = wpa_debug_open_linux_tracing();
@@ -898,7 +882,6 @@
hostapd_global_deinit(pid_file, interfaces.eloop_initialized);
os_free(pid_file);
- wpa_debug_close_syslog();
if (log_file)
wpa_debug_close_file();
wpa_debug_close_linux_tracing();