From affdd335919192d78652fe36d0283d8cf04b0ca2 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 24 Jun 2016 17:28:39 +0300 Subject: [PATCH] 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 --- wpa_supplicant/autoscan.c | 7 ------- wpa_supplicant/autoscan.h | 10 ++++++++++ 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) -- 2.1.4