merge mac80211, iw, hostapd from trunk to backfire

[openwrt-10.03/.git] / package / hostapd / patches / 320-rescan_immediately.patch

diff --git a/package/hostapd/patches/320-rescan_immediately.patch b/package/hostapd/patches/320-rescan_immediately.patch
index a4020bc1dd700b7a93ff1b2573eeaf1aaf0bc29b..19183040a9e1da7ed29404d5394e61ed49bc1aa8 100644 (file)
--- a/package/hostapd/patches/320-rescan_immediately.patch
+++ b/package/hostapd/patches/320-rescan_immediately.patch
@@ -1,11 +1,11 @@
 --- a/wpa_supplicant/events.c
 +++ b/wpa_supplicant/events.c
-@@ -843,7 +843,7 @@ static void wpa_supplicant_event_scan_re
+@@ -963,7 +963,7 @@ static void wpa_supplicant_event_scan_re
                        wpa_printf(MSG_DEBUG, "Setup a new network");
                        wpa_supplicant_associate(wpa_s, NULL, ssid);
-               } else
--                      wpa_supplicant_req_new_scan(wpa_s, 5);
-+                      wpa_supplicant_req_new_scan(wpa_s, 0);
-       }
- }
- #endif /* CONFIG_NO_SCAN_PROCESSING */
+               } else {
+-                      int timeout_sec = 5;
++                      int timeout_sec = 0;
+                       int timeout_usec = 0;
+                       wpa_supplicant_req_new_scan(wpa_s, timeout_sec,
+                                                   timeout_usec);