projects
/
mech_eap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Interworking: Remove unused allow_excluded from interworking_connect()
[mech_eap.git]
/
wpa_supplicant
/
bgscan.c
diff --git
a/wpa_supplicant/bgscan.c
b/wpa_supplicant/bgscan.c
index
9a9bd52
..
798b43c
100644
(file)
--- a/
wpa_supplicant/bgscan.c
+++ b/
wpa_supplicant/bgscan.c
@@
-13,12
+13,6
@@
#include "config_ssid.h"
#include "bgscan.h"
#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
static const struct bgscan_ops * bgscan_modules[] = {
#ifdef CONFIG_BGSCAN_SIMPLE
@@
-31,9
+25,9
@@
static const struct bgscan_ops * bgscan_modules[] = {
};
};
-int bgscan_init(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
+int bgscan_init(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid,
+ const char *name)
{
{
- const char *name = ssid->bgscan;
const char *params;
size_t nlen;
int i;
const char *params;
size_t nlen;
int i;
@@
-41,7
+35,7
@@
int bgscan_init(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
bgscan_deinit(wpa_s);
if (name == NULL)
bgscan_deinit(wpa_s);
if (name == NULL)
- return
0
;
+ return
-1
;
params = os_strchr(name, ':');
if (params == NULL) {
params = os_strchr(name, ':');
if (params == NULL) {