[backfire] backport mac80211 and hostapd from trunk

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

diff --git a/package/hostapd/patches/310-scan_ssid.patch b/package/hostapd/patches/310-scan_ssid.patch
index 5a7e10f6b78134a47d7aad0466404e66a9ae4914..60babf474dee29d69bac6ce4da172c421dd0205b 100644 (file)
--- a/package/hostapd/patches/310-scan_ssid.patch
+++ b/package/hostapd/patches/310-scan_ssid.patch
@@ -1,14 +1,14 @@
 --- a/wpa_supplicant/scan.c
 +++ b/wpa_supplicant/scan.c
-@@ -215,6 +215,7 @@ static void wpa_supplicant_scan(void *el
+@@ -248,6 +248,7 @@ static void wpa_supplicant_scan(void *el
        enum wps_request_type req_type = WPS_REQ_ENROLLEE_INFO;
  #endif /* CONFIG_WPS */
        struct wpa_driver_scan_params params;
 +      int scan_ssid_all = 1;
        size_t max_ssids;
+       enum wpa_states prev_state;
  
-       if (wpa_s->disconnected && !wpa_s->scan_req) {
-@@ -275,6 +276,16 @@ static void wpa_supplicant_scan(void *el
+@@ -311,6 +312,16 @@ static void wpa_supplicant_scan(void *el
            wpa_s->wpa_state == WPA_INACTIVE)
                wpa_supplicant_set_state(wpa_s, WPA_SCANNING);
  
@@ -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) {
-@@ -336,6 +347,9 @@ static void wpa_supplicant_scan(void *el
+@@ -374,6 +385,9 @@ static void wpa_supplicant_scan(void *el
                int_array_sort_unique(params.freqs);
        }