hostapd: update to latest version from trunk (fixes #10455)

[openwrt-10.03/.git] / package / hostapd / patches / 300-scan_ssid.patch

diff --git a/package/hostapd/patches/300-scan_ssid.patch b/package/hostapd/patches/300-scan_ssid.patch
index 47528f8b6b56bf79c60450dde0ba96b6541d075a..2309d1cd6531a1b36d82f62a0463a0f19e4a1462 100644 (file)
--- a/package/hostapd/patches/300-scan_ssid.patch
+++ b/package/hostapd/patches/300-scan_ssid.patch
@@ -1,16 +1,16 @@
 --- a/wpa_supplicant/scan.c
 +++ b/wpa_supplicant/scan.c
-@@ -251,6 +251,7 @@ static void wpa_supplicant_scan(void *el
-       enum wps_request_type req_type = WPS_REQ_ENROLLEE_INFO;
- #endif /* CONFIG_WPS */
+@@ -423,6 +423,7 @@ static void wpa_supplicant_scan(void *el
+       int scan_req = 0, ret;
+       struct wpabuf *extra_ie;
        struct wpa_driver_scan_params params;
 +      int scan_ssid_all = 1;
        size_t max_ssids;
        enum wpa_states prev_state;
  
-@@ -307,6 +308,16 @@ static void wpa_supplicant_scan(void *el
-           wpa_s->wpa_state == WPA_INACTIVE)
-               wpa_supplicant_set_state(wpa_s, WPA_SCANNING);
+@@ -502,6 +503,16 @@ static void wpa_supplicant_scan(void *el
+               }
+       }
  
 +      /* check if all configured ssids should be scanned directly */
 +      ssid = wpa_s->conf->ssid;
@@ -25,7 +25,7 @@
        /* Find the starting point from which to continue scanning */
        ssid = wpa_s->conf->ssid;
        if (wpa_s->prev_scan_ssid != WILDCARD_SSID_SCAN) {
-@@ -370,6 +381,9 @@ static void wpa_supplicant_scan(void *el
+@@ -564,6 +575,9 @@ static void wpa_supplicant_scan(void *el
                int_array_sort_unique(params.freqs);
        }