Changeset 11930


Ignore:
Timestamp:
2008-07-26T00:37:36+02:00 (10 years ago)
Author:
nbd
Message:

wpa_supplicant: improve scan cache reliability

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/wpa_supplicant/patches/130-scanning.patch

    r11833 r11930  
    11Add a scan result cache to improve roaming speed if the driver gave us a background scan before losing the connection. 
    22 
    3 Index: wpa_supplicant-0.6.3/wpa_supplicant/config.h 
    4 =================================================================== 
    5 --- wpa_supplicant-0.6.3.orig/wpa_supplicant/config.h   2008-02-23 03:45:24.000000000 +0100 
    6 +++ wpa_supplicant-0.6.3/wpa_supplicant/config.h        2008-07-10 15:08:21.000000000 +0200 
     3--- a/wpa_supplicant/config.h 
     4+++ b/wpa_supplicant/config.h 
    75@@ -97,6 +97,12 @@ 
    86        int ap_scan; 
     
    1816         * 
    1917         * If this is specified, %wpa_supplicant will open a control interface 
    20 Index: wpa_supplicant-0.6.3/wpa_supplicant/config_file.c 
    21 =================================================================== 
    22 --- wpa_supplicant-0.6.3.orig/wpa_supplicant/config_file.c      2008-02-23 03:45:24.000000000 +0100 
    23 +++ wpa_supplicant-0.6.3/wpa_supplicant/config_file.c   2008-07-10 15:59:38.000000000 +0200 
     18--- a/wpa_supplicant/config_file.c 
     19+++ b/wpa_supplicant/config_file.c 
    2420@@ -312,6 +312,13 @@ 
    2521        return 0; 
     
    5551                fprintf(f, "fast_reauth=%d\n", config->fast_reauth); 
    5652 #ifdef EAP_TLS_OPENSSL 
    57 Index: wpa_supplicant-0.6.3/wpa_supplicant/events.c 
    58 =================================================================== 
    59 --- wpa_supplicant-0.6.3.orig/wpa_supplicant/events.c   2008-07-10 13:27:03.000000000 +0200 
    60 +++ wpa_supplicant-0.6.3/wpa_supplicant/events.c        2008-07-10 17:18:53.000000000 +0200 
     53--- a/wpa_supplicant/events.c 
     54+++ b/wpa_supplicant/events.c 
    6155@@ -555,6 +555,9 @@ 
    6256        if (wpa_s->conf->ap_scan == 2 || wpa_s->disconnected) 
     
    6963                for (prio = 0; prio < wpa_s->conf->num_prio; prio++) { 
    7064                        selected = wpa_supplicant_select_bss( 
    71 @@ -594,13 +597,16 @@ 
     65@@ -567,6 +570,7 @@ 
     66                        wpa_printf(MSG_DEBUG, "No APs found - clear blacklist " 
     67                                   "and try again"); 
     68                        wpa_blacklist_clear(wpa_s); 
     69+                       memset(&wpa_s->last_scan_results, 0, sizeof(wpa_s->last_scan_results)); 
     70                } else if (selected == NULL) { 
     71                        break; 
     72                } 
     73@@ -594,10 +598,12 @@ 
    7274                rsn_preauth_scan_results(wpa_s->wpa, wpa_s->scan_res); 
    7375        } else { 
    7476                wpa_printf(MSG_DEBUG, "No suitable AP found."); 
    7577-               timeout = 5; 
    76 +               timeout = 1; 
     78+               timeout = 0; 
    7779                goto req_scan; 
    7880        } 
     
    8385  
    8486 req_scan: 
    85 +       memset(&wpa_s->last_scan_results, 0, sizeof(wpa_s->last_scan_results)); 
    86         if (wpa_s->scan_res_tried == 1 && wpa_s->conf->ap_scan == 1) { 
    87                 /* 
    88                  * Quick recovery if the initial scan results were not 
    8987@@ -804,6 +810,9 @@ 
    9088        } 
     
    9795        if (os_memcmp(bssid, "\x00\x00\x00\x00\x00\x00", ETH_ALEN) == 0) 
    9896                bssid = wpa_s->pending_bssid; 
    99 Index: wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant_i.h 
    100 =================================================================== 
    101 --- wpa_supplicant-0.6.3.orig/wpa_supplicant/wpa_supplicant_i.h 2008-07-10 15:03:56.000000000 +0200 
    102 +++ wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant_i.h      2008-07-10 15:16:17.000000000 +0200 
     97--- a/wpa_supplicant/wpa_supplicant_i.h 
     98+++ b/wpa_supplicant/wpa_supplicant_i.h 
    10399@@ -334,6 +334,7 @@ 
    104100        struct wpa_client_mlme mlme; 
     
    117113  
    118114 /* events.c */ 
    119 Index: wpa_supplicant-0.6.3/wpa_supplicant/scan.c 
    120 =================================================================== 
    121 --- wpa_supplicant-0.6.3.orig/wpa_supplicant/scan.c     2008-07-10 13:27:03.000000000 +0200 
    122 +++ wpa_supplicant-0.6.3/wpa_supplicant/scan.c  2008-07-10 16:24:31.000000000 +0200 
     115--- a/wpa_supplicant/scan.c 
     116+++ b/wpa_supplicant/scan.c 
    123117@@ -40,6 +40,18 @@ 
    124118        wpa_supplicant_event(wpa_s, EVENT_ASSOC, &data); 
     
    152146                wpa_printf(MSG_DEBUG, "Trying to get current scan results " 
    153147                           "first without requesting a new scan to speed up " 
    154 Index: wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c 
    155 =================================================================== 
    156 --- wpa_supplicant-0.6.3.orig/wpa_supplicant/wpa_supplicant.c   2008-07-10 14:41:16.000000000 +0200 
    157 +++ wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c        2008-07-10 18:45:59.000000000 +0200 
     148--- a/wpa_supplicant/wpa_supplicant.c 
     149+++ b/wpa_supplicant/wpa_supplicant.c 
    158150@@ -1417,6 +1417,9 @@ 
    159151 { 
Note: See TracChangeset for help on using the changeset viewer.