From 9eece21357b6706ca783635b761350e74a8e8992 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 24 Jun 2016 17:27:12 +0300 Subject: [PATCH] Move extern declarations for bgscan 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/bgscan.c | 6 ------ wpa_supplicant/bgscan.h | 9 +++++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/wpa_supplicant/bgscan.c b/wpa_supplicant/bgscan.c index f74cdbf..798b43c 100644 --- a/wpa_supplicant/bgscan.c +++ b/wpa_supplicant/bgscan.c @@ -13,12 +13,6 @@ #include "config_ssid.h" #include "bgscan.h" -#ifdef CONFIG_BGSCAN_SIMPLE -extern const struct bgscan_ops bgscan_simple_ops; -#endif /* CONFIG_BGSCAN_SIMPLE */ -#ifdef CONFIG_BGSCAN_LEARN -extern const struct bgscan_ops bgscan_learn_ops; -#endif /* CONFIG_BGSCAN_LEARN */ static const struct bgscan_ops * bgscan_modules[] = { #ifdef CONFIG_BGSCAN_SIMPLE diff --git a/wpa_supplicant/bgscan.h b/wpa_supplicant/bgscan.h index 9131e4e..3df1550 100644 --- a/wpa_supplicant/bgscan.h +++ b/wpa_supplicant/bgscan.h @@ -39,6 +39,15 @@ void bgscan_notify_signal_change(struct wpa_supplicant *wpa_s, int above, int current_signal, int current_noise, int current_txrate); +/* Available bgscan modules */ + +#ifdef CONFIG_BGSCAN_SIMPLE +extern const struct bgscan_ops bgscan_simple_ops; +#endif /* CONFIG_BGSCAN_SIMPLE */ +#ifdef CONFIG_BGSCAN_LEARN +extern const struct bgscan_ops bgscan_learn_ops; +#endif /* CONFIG_BGSCAN_LEARN */ + #else /* CONFIG_BGSCAN */ static inline int bgscan_init(struct wpa_supplicant *wpa_s, -- 2.1.4