aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2016-06-24 14:28:39 (GMT)
committerJouni Malinen <j@w1.fi>2016-06-24 16:02:58 (GMT)
commitaffdd335919192d78652fe36d0283d8cf04b0ca2 (patch)
treeea79b811f0fe55e04ca5e097e3be240c007c4945
parent9eece21357b6706ca783635b761350e74a8e8992 (diff)
downloadhostap-affdd335919192d78652fe36d0283d8cf04b0ca2.zip
hostap-affdd335919192d78652fe36d0283d8cf04b0ca2.tar.gz
hostap-affdd335919192d78652fe36d0283d8cf04b0ca2.tar.bz2
Move extern declarations for autoscan modules into a header file
This gets rid of number of sparse warnings and also allows the compatibility of the declarations to be verified. Signed-off-by: Jouni Malinen <j@w1.fi>
-rw-r--r--wpa_supplicant/autoscan.c7
-rw-r--r--wpa_supplicant/autoscan.h10
2 files changed, 10 insertions, 7 deletions
diff --git a/wpa_supplicant/autoscan.c b/wpa_supplicant/autoscan.c
index d12eb21..072a1d5 100644
--- a/wpa_supplicant/autoscan.c
+++ b/wpa_supplicant/autoscan.c
@@ -16,13 +16,6 @@
#include "scan.h"
#include "autoscan.h"
-#ifdef CONFIG_AUTOSCAN_EXPONENTIAL
-extern const struct autoscan_ops autoscan_exponential_ops;
-#endif /* CONFIG_AUTOSCAN_EXPONENTIAL */
-
-#ifdef CONFIG_AUTOSCAN_PERIODIC
-extern const struct autoscan_ops autoscan_periodic_ops;
-#endif /* CONFIG_AUTOSCAN_PERIODIC */
static const struct autoscan_ops * autoscan_modules[] = {
#ifdef CONFIG_AUTOSCAN_EXPONENTIAL
diff --git a/wpa_supplicant/autoscan.h b/wpa_supplicant/autoscan.h
index e2a7652..560684f 100644
--- a/wpa_supplicant/autoscan.h
+++ b/wpa_supplicant/autoscan.h
@@ -27,6 +27,16 @@ void autoscan_deinit(struct wpa_supplicant *wpa_s);
int autoscan_notify_scan(struct wpa_supplicant *wpa_s,
struct wpa_scan_results *scan_res);
+/* Available autoscan modules */
+
+#ifdef CONFIG_AUTOSCAN_EXPONENTIAL
+extern const struct autoscan_ops autoscan_exponential_ops;
+#endif /* CONFIG_AUTOSCAN_EXPONENTIAL */
+
+#ifdef CONFIG_AUTOSCAN_PERIODIC
+extern const struct autoscan_ops autoscan_periodic_ops;
+#endif /* CONFIG_AUTOSCAN_PERIODIC */
+
#else /* CONFIG_AUTOSCAN */
static inline int autoscan_init(struct wpa_supplicant *wpa_s, int req_scan)