projects
/
mech_eap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set default scan IEs to the driver (QCA vendor extension)
[mech_eap.git]
/
wpa_supplicant
/
bgscan.c
diff --git
a/wpa_supplicant/bgscan.c
b/wpa_supplicant/bgscan.c
index
e5fdfc4
..
798b43c
100644
(file)
--- a/
wpa_supplicant/bgscan.c
+++ b/
wpa_supplicant/bgscan.c
@@
-2,14
+2,8
@@
* WPA Supplicant - background scan and roaming interface
* Copyright (c) 2009-2010, Jouni Malinen <j@w1.fi>
*
* WPA Supplicant - background scan and roaming interface
* Copyright (c) 2009-2010, Jouni Malinen <j@w1.fi>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
*/
#include "includes.h"
*/
#include "includes.h"
@@
-19,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
@@
-37,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;
@@
-47,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) {
@@
-111,8
+99,13
@@
void bgscan_notify_beacon_loss(struct wpa_supplicant *wpa_s)
}
}
-void bgscan_notify_signal_change(struct wpa_supplicant *wpa_s, int above)
+void bgscan_notify_signal_change(struct wpa_supplicant *wpa_s, int above,
+ int current_signal, int current_noise,
+ int current_txrate)
{
if (wpa_s->bgscan && wpa_s->bgscan_priv)
{
if (wpa_s->bgscan && wpa_s->bgscan_priv)
- wpa_s->bgscan->notify_signal_change(wpa_s->bgscan_priv, above);
+ wpa_s->bgscan->notify_signal_change(wpa_s->bgscan_priv, above,
+ current_signal,
+ current_noise,
+ current_txrate);
}
}