aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2010-07-10 22:43:44 (GMT)
committerJouni Malinen <j@w1.fi>2010-07-10 22:43:44 (GMT)
commitc2594c3677c8f529febe31600afb95e61d8b39bb (patch)
tree4b92024755c5bf4152486e1fe764026992113290
parent3b038d796852d5aa05ca2c53298749ab16187367 (diff)
downloadhostap-c2594c3677c8f529febe31600afb95e61d8b39bb.zip
hostap-c2594c3677c8f529febe31600afb95e61d8b39bb.tar.gz
hostap-c2594c3677c8f529febe31600afb95e61d8b39bb.tar.bz2
bgscan: Provide scan results to the notify_scan handler
-rw-r--r--wpa_supplicant/bgscan.c6
-rw-r--r--wpa_supplicant/bgscan.h8
-rw-r--r--wpa_supplicant/bgscan_simple.c3
-rw-r--r--wpa_supplicant/events.c2
4 files changed, 12 insertions, 7 deletions
diff --git a/wpa_supplicant/bgscan.c b/wpa_supplicant/bgscan.c
index 31b5d27..a0d98db 100644
--- a/wpa_supplicant/bgscan.c
+++ b/wpa_supplicant/bgscan.c
@@ -88,10 +88,12 @@ void bgscan_deinit(struct wpa_supplicant *wpa_s)
}
-int bgscan_notify_scan(struct wpa_supplicant *wpa_s)
+int bgscan_notify_scan(struct wpa_supplicant *wpa_s,
+ struct wpa_scan_results *scan_res)
{
if (wpa_s->bgscan && wpa_s->bgscan_priv)
- return wpa_s->bgscan->notify_scan(wpa_s->bgscan_priv);
+ return wpa_s->bgscan->notify_scan(wpa_s->bgscan_priv,
+ scan_res);
return 0;
}
diff --git a/wpa_supplicant/bgscan.h b/wpa_supplicant/bgscan.h
index 69e99b6..e0c9eb0 100644
--- a/wpa_supplicant/bgscan.h
+++ b/wpa_supplicant/bgscan.h
@@ -25,7 +25,7 @@ struct bgscan_ops {
const struct wpa_ssid *ssid);
void (*deinit)(void *priv);
- int (*notify_scan)(void *priv);
+ int (*notify_scan)(void *priv, struct wpa_scan_results *scan_res);
void (*notify_beacon_loss)(void *priv);
void (*notify_signal_change)(void *priv, int above);
};
@@ -34,7 +34,8 @@ struct bgscan_ops {
int bgscan_init(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid);
void bgscan_deinit(struct wpa_supplicant *wpa_s);
-int bgscan_notify_scan(struct wpa_supplicant *wpa_s);
+int bgscan_notify_scan(struct wpa_supplicant *wpa_s,
+ struct wpa_scan_results *scan_res);
void bgscan_notify_beacon_loss(struct wpa_supplicant *wpa_s);
void bgscan_notify_signal_change(struct wpa_supplicant *wpa_s, int above);
@@ -50,7 +51,8 @@ static inline void bgscan_deinit(struct wpa_supplicant *wpa_s)
{
}
-static inline int bgscan_notify_scan(struct wpa_supplicant *wpa_s)
+static inline int bgscan_notify_scan(struct wpa_supplicant *wpa_s,
+ struct wpa_scan_results *scan_res)
{
return 0;
}
diff --git a/wpa_supplicant/bgscan_simple.c b/wpa_supplicant/bgscan_simple.c
index a932553..aeecc01 100644
--- a/wpa_supplicant/bgscan_simple.c
+++ b/wpa_supplicant/bgscan_simple.c
@@ -138,7 +138,8 @@ static void bgscan_simple_deinit(void *priv)
}
-static int bgscan_simple_notify_scan(void *priv)
+static int bgscan_simple_notify_scan(void *priv,
+ struct wpa_scan_results *scan_res)
{
struct bgscan_simple_data *data = priv;
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 1c14f69..93dfe59 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -938,7 +938,7 @@ static void wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s,
return;
}
- if (bgscan_notify_scan(wpa_s) == 1) {
+ if (bgscan_notify_scan(wpa_s, scan_res) == 1) {
wpa_scan_results_free(scan_res);
return;
}