backport mac80211, hostapd, iw, crda from trunk as of r26369

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

diff --git a/package/hostapd/patches/310-scan_ssid.patch b/package/hostapd/patches/300-scan_ssid.patch
similarity index 82%
rename from package/hostapd/patches/310-scan_ssid.patch
rename to package/hostapd/patches/300-scan_ssid.patch
index 884459ce6651163a8a859ff084a90799a7a96928..47528f8b6b56bf79c60450dde0ba96b6541d075a 100644 (file)
--- a/package/hostapd/patches/310-scan_ssid.patch
+++ b/package/hostapd/patches/300-scan_ssid.patch
@@ -1,6 +1,6 @@
 --- a/wpa_supplicant/scan.c
 +++ b/wpa_supplicant/scan.c
-@@ -248,6 +248,7 @@ static void wpa_supplicant_scan(void *el
+@@ -251,6 +251,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;
@@ -8,7 +8,7 @@
        size_t max_ssids;
        enum wpa_states prev_state;
  
-@@ -316,6 +317,16 @@ static void wpa_supplicant_scan(void *el
+@@ -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);
  
@@ -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) {
-@@ -379,6 +390,9 @@ static void wpa_supplicant_scan(void *el
+@@ -370,6 +381,9 @@ static void wpa_supplicant_scan(void *el
                int_array_sort_unique(params.freqs);
        }