source: branches/backfire/package/hostapd/patches/310-scan_ssid.patch @ 21354

Last change on this file since 21354 was 21354, checked in by nbd, 7 years ago

[backfire] backport mac80211 and hostapd from trunk

File size: 1.0 KB
  • wpa_supplicant/scan.c

    a b static void wpa_supplicant_scan(void *el 
    248248        enum wps_request_type req_type = WPS_REQ_ENROLLEE_INFO; 
    249249#endif /* CONFIG_WPS */ 
    250250        struct wpa_driver_scan_params params; 
     251        int scan_ssid_all = 1; 
    251252        size_t max_ssids; 
    252253        enum wpa_states prev_state; 
    253254 
    static void wpa_supplicant_scan(void *el 
    311312            wpa_s->wpa_state == WPA_INACTIVE) 
    312313                wpa_supplicant_set_state(wpa_s, WPA_SCANNING); 
    313314 
     315        /* check if all configured ssids should be scanned directly */ 
     316        ssid = wpa_s->conf->ssid; 
     317        while (ssid) { 
     318                if (!ssid->scan_ssid) { 
     319                        scan_ssid_all = 0; 
     320                        break; 
     321                } 
     322                ssid = ssid->next; 
     323        } 
     324 
    314325        /* Find the starting point from which to continue scanning */ 
    315326        ssid = wpa_s->conf->ssid; 
    316327        if (wpa_s->prev_scan_ssid != WILDCARD_SSID_SCAN) { 
    static void wpa_supplicant_scan(void *el 
    374385                int_array_sort_unique(params.freqs); 
    375386        } 
    376387 
     388        if (scan_ssid_all && !ssid) 
     389                ssid = wpa_s->conf->ssid; 
     390 
    377391        if (ssid) { 
    378392                wpa_s->prev_scan_ssid = ssid; 
    379393                if (max_ssids > 1) { 
Note: See TracBrowser for help on using the repository browser.