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

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

diff --git a/package/hostapd/patches/320-rescan_immediately.patch b/package/hostapd/patches/530-rescan_immediately.patch
similarity index 51%
rename from package/hostapd/patches/320-rescan_immediately.patch
rename to package/hostapd/patches/530-rescan_immediately.patch
index 19183040a9e1da7ed29404d5394e61ed49bc1aa8..b6efbb8d0c3b6dab913e057fbbc77c461dd4f038 100644 (file)
--- a/package/hostapd/patches/320-rescan_immediately.patch
+++ b/package/hostapd/patches/530-rescan_immediately.patch
@@ -1,11 +1,11 @@
 --- a/wpa_supplicant/events.c
 +++ b/wpa_supplicant/events.c
 --- a/wpa_supplicant/events.c
 +++ b/wpa_supplicant/events.c

-@@ -963,7 +963,7 @@ static void wpa_supplicant_event_scan_re
-                       wpa_printf(MSG_DEBUG, "Setup a new network");
+@@ -953,7 +953,7 @@ static int _wpa_supplicant_event_scan_re
+                       wpa_dbg(wpa_s, MSG_DEBUG, "Setup a new network");

                        wpa_supplicant_associate(wpa_s, NULL, ssid);
                } else {
 -                      int timeout_sec = 5;
 +                      int timeout_sec = 0;
                        int timeout_usec = 0;
                        wpa_supplicant_associate(wpa_s, NULL, ssid);
                } else {
 -                      int timeout_sec = 5;
 +                      int timeout_sec = 0;
                        int timeout_usec = 0;

-                       wpa_supplicant_req_new_scan(wpa_s, timeout_sec,
-                                                   timeout_usec);
+ #ifdef CONFIG_P2P
+                       if (wpa_s->p2p_in_provisioning) {