aboutsummaryrefslogtreecommitdiffstats
path: root/package/wpa_supplicant/patches
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-07-25 22:37:36 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-07-25 22:37:36 +0000
commit7cc66842083bdd572dbad4ba28c55015520f263d (patch)
tree8ca4e2ff88a63d1aa1ad2f02a90d8d4acf9cb1ce /package/wpa_supplicant/patches
parent277d6885b028e8fae61e97f9aeed6d5f9de66035 (diff)
downloadupstream-7cc66842083bdd572dbad4ba28c55015520f263d.tar.gz
upstream-7cc66842083bdd572dbad4ba28c55015520f263d.tar.bz2
upstream-7cc66842083bdd572dbad4ba28c55015520f263d.zip
wpa_supplicant: improve scan cache reliability
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11930 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/wpa_supplicant/patches')
-rw-r--r--package/wpa_supplicant/patches/130-scanning.patch52
1 files changed, 22 insertions, 30 deletions
diff --git a/package/wpa_supplicant/patches/130-scanning.patch b/package/wpa_supplicant/patches/130-scanning.patch
index 4b3dc970f3..c5e2525993 100644
--- a/package/wpa_supplicant/patches/130-scanning.patch
+++ b/package/wpa_supplicant/patches/130-scanning.patch
@@ -1,9 +1,7 @@
Add a scan result cache to improve roaming speed if the driver gave us a background scan before losing the connection.
-Index: wpa_supplicant-0.6.3/wpa_supplicant/config.h
-===================================================================
---- wpa_supplicant-0.6.3.orig/wpa_supplicant/config.h 2008-02-23 03:45:24.000000000 +0100
-+++ wpa_supplicant-0.6.3/wpa_supplicant/config.h 2008-07-10 15:08:21.000000000 +0200
+--- a/wpa_supplicant/config.h
++++ b/wpa_supplicant/config.h
@@ -97,6 +97,12 @@
int ap_scan;
@@ -17,10 +15,8 @@ Index: wpa_supplicant-0.6.3/wpa_supplicant/config.h
* ctrl_interface - Parameters for the control interface
*
* If this is specified, %wpa_supplicant will open a control interface
-Index: wpa_supplicant-0.6.3/wpa_supplicant/config_file.c
-===================================================================
---- wpa_supplicant-0.6.3.orig/wpa_supplicant/config_file.c 2008-02-23 03:45:24.000000000 +0100
-+++ wpa_supplicant-0.6.3/wpa_supplicant/config_file.c 2008-07-10 15:59:38.000000000 +0200
+--- a/wpa_supplicant/config_file.c
++++ b/wpa_supplicant/config_file.c
@@ -312,6 +312,13 @@
return 0;
}
@@ -54,10 +50,8 @@ Index: wpa_supplicant-0.6.3/wpa_supplicant/config_file.c
if (config->fast_reauth != DEFAULT_FAST_REAUTH)
fprintf(f, "fast_reauth=%d\n", config->fast_reauth);
#ifdef EAP_TLS_OPENSSL
-Index: wpa_supplicant-0.6.3/wpa_supplicant/events.c
-===================================================================
---- wpa_supplicant-0.6.3.orig/wpa_supplicant/events.c 2008-07-10 13:27:03.000000000 +0200
-+++ wpa_supplicant-0.6.3/wpa_supplicant/events.c 2008-07-10 17:18:53.000000000 +0200
+--- a/wpa_supplicant/events.c
++++ b/wpa_supplicant/events.c
@@ -555,6 +555,9 @@
if (wpa_s->conf->ap_scan == 2 || wpa_s->disconnected)
return;
@@ -68,12 +62,20 @@ Index: wpa_supplicant-0.6.3/wpa_supplicant/events.c
while (selected == NULL) {
for (prio = 0; prio < wpa_s->conf->num_prio; prio++) {
selected = wpa_supplicant_select_bss(
-@@ -594,13 +597,16 @@
+@@ -567,6 +570,7 @@
+ wpa_printf(MSG_DEBUG, "No APs found - clear blacklist "
+ "and try again");
+ wpa_blacklist_clear(wpa_s);
++ memset(&wpa_s->last_scan_results, 0, sizeof(wpa_s->last_scan_results));
+ } else if (selected == NULL) {
+ break;
+ }
+@@ -594,10 +598,12 @@
rsn_preauth_scan_results(wpa_s->wpa, wpa_s->scan_res);
} else {
wpa_printf(MSG_DEBUG, "No suitable AP found.");
- timeout = 5;
-+ timeout = 1;
++ timeout = 0;
goto req_scan;
}
@@ -82,10 +84,6 @@ Index: wpa_supplicant-0.6.3/wpa_supplicant/events.c
return;
req_scan:
-+ memset(&wpa_s->last_scan_results, 0, sizeof(wpa_s->last_scan_results));
- if (wpa_s->scan_res_tried == 1 && wpa_s->conf->ap_scan == 1) {
- /*
- * Quick recovery if the initial scan results were not
@@ -804,6 +810,9 @@
}
if (wpa_s->wpa_state >= WPA_ASSOCIATED)
@@ -96,10 +94,8 @@ Index: wpa_supplicant-0.6.3/wpa_supplicant/events.c
bssid = wpa_s->bssid;
if (os_memcmp(bssid, "\x00\x00\x00\x00\x00\x00", ETH_ALEN) == 0)
bssid = wpa_s->pending_bssid;
-Index: wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant_i.h
-===================================================================
---- wpa_supplicant-0.6.3.orig/wpa_supplicant/wpa_supplicant_i.h 2008-07-10 15:03:56.000000000 +0200
-+++ wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant_i.h 2008-07-10 15:16:17.000000000 +0200
+--- a/wpa_supplicant/wpa_supplicant_i.h
++++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -334,6 +334,7 @@
struct wpa_client_mlme mlme;
int use_client_mlme;
@@ -116,10 +112,8 @@ Index: wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant_i.h
void wpa_supplicant_cancel_scan(struct wpa_supplicant *wpa_s);
/* events.c */
-Index: wpa_supplicant-0.6.3/wpa_supplicant/scan.c
-===================================================================
---- wpa_supplicant-0.6.3.orig/wpa_supplicant/scan.c 2008-07-10 13:27:03.000000000 +0200
-+++ wpa_supplicant-0.6.3/wpa_supplicant/scan.c 2008-07-10 16:24:31.000000000 +0200
+--- a/wpa_supplicant/scan.c
++++ b/wpa_supplicant/scan.c
@@ -40,6 +40,18 @@
wpa_supplicant_event(wpa_s, EVENT_ASSOC, &data);
}
@@ -151,10 +145,8 @@ Index: wpa_supplicant-0.6.3/wpa_supplicant/scan.c
wpa_s->scan_res_tried++;
wpa_printf(MSG_DEBUG, "Trying to get current scan results "
"first without requesting a new scan to speed up "
-Index: wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c
-===================================================================
---- wpa_supplicant-0.6.3.orig/wpa_supplicant/wpa_supplicant.c 2008-07-10 14:41:16.000000000 +0200
-+++ wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c 2008-07-10 18:45:59.000000000 +0200
+--- a/wpa_supplicant/wpa_supplicant.c
++++ b/wpa_supplicant/wpa_supplicant.c
@@ -1417,6 +1417,9 @@
{
struct wpa_supplicant *wpa_s = ctx;