wpa_supplicant has been upgraded and previous version

[openwrt/svn-archive/archive.git] / package / wpa_supplicant / patches / 110-roaming.patch

diff --git a/package/wpa_supplicant/patches/110-roaming.patch b/package/wpa_supplicant/patches/110-roaming.patch
index 8c6210da1dc0b8d932d5a3224cc3d32b2511fcd9..b552dfc425d84143efe76f392d15e96a403f2af9 100644 (file)
--- a/package/wpa_supplicant/patches/110-roaming.patch
+++ b/package/wpa_supplicant/patches/110-roaming.patch
@@ -1,9 +1,9 @@
 This patch decreases the timeouts for assoc/auth to more realistic values. Improves roaming speed
-Index: wpa_supplicant-0.6.3/wpa_supplicant/events.c
+Index: wpa_supplicant-0.6.6/wpa_supplicant/events.c
 ===================================================================
---- wpa_supplicant-0.6.3.orig/wpa_supplicant/events.c  2008-02-23 03:45:24.000000000 +0100
-+++ wpa_supplicant-0.6.3/wpa_supplicant/events.c       2008-07-09 15:13:37.000000000 +0200
-@@ -762,7 +762,7 @@
+--- wpa_supplicant-0.6.6.orig/wpa_supplicant/events.c  2008-02-23 03:45:24.000000000 +0100
++++ wpa_supplicant-0.6.6/wpa_supplicant/events.c       2008-07-09 15:13:37.000000000 +0200
+@@ -807,7 +807,7 @@
                wpa_supplicant_set_state(wpa_s, WPA_COMPLETED);
        } else if (!ft_completed) {
                /* Timeout for receiving the first EAPOL packet */
@@ -12,11 +12,11 @@ Index: wpa_supplicant-0.6.3/wpa_supplicant/events.c
        }
        wpa_supplicant_cancel_scan(wpa_s);
  
-Index: wpa_supplicant-0.6.3/wpa_supplicant/scan.c
+Index: wpa_supplicant-0.6.6/wpa_supplicant/scan.c
 ===================================================================
---- wpa_supplicant-0.6.3.orig/wpa_supplicant/scan.c    2008-02-23 03:45:24.000000000 +0100
-+++ wpa_supplicant-0.6.3/wpa_supplicant/scan.c 2008-07-09 15:13:37.000000000 +0200
-@@ -144,6 +144,7 @@
+--- wpa_supplicant-0.6.6.orig/wpa_supplicant/scan.c    2008-02-23 03:45:24.000000000 +0100
++++ wpa_supplicant-0.6.6/wpa_supplicant/scan.c 2008-07-09 15:13:37.000000000 +0200
+@@ -145,6 +145,7 @@
                return;
        }
  
@@ -24,7 +24,7 @@ Index: wpa_supplicant-0.6.3/wpa_supplicant/scan.c
        if (wpa_s->use_client_mlme) {
                ieee80211_sta_set_probe_req_ie(wpa_s, extra_ie, extra_ie_len);
                ret = ieee80211_sta_req_scan(wpa_s, ssid ? ssid->ssid : NULL,
-@@ -156,7 +157,7 @@
+@@ -157,7 +158,7 @@
  
        if (ret) {
                wpa_printf(MSG_WARNING, "Failed to initiate AP scan.");
@@ -33,19 +33,20 @@ Index: wpa_supplicant-0.6.3/wpa_supplicant/scan.c
        }
  }
  
-Index: wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c
+Index: wpa_supplicant-0.6.6/wpa_supplicant/wpa_supplicant.c
 ===================================================================
---- wpa_supplicant-0.6.3.orig/wpa_supplicant/wpa_supplicant.c  2008-02-23 03:45:24.000000000 +0100
-+++ wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c       2008-07-09 15:13:37.000000000 +0200
-@@ -1092,9 +1092,9 @@
-               /* Timeout for IEEE 802.11 authentication and association */
-               int timeout;
-               if (assoc_failed)
--                      timeout = 5;
-+                      timeout = 2;
-               else if (wpa_s->conf->ap_scan == 1)
--                      timeout = 10;
-+                      timeout = 3;
-               else
-                       timeout = 60;
+--- wpa_supplicant-0.6.6/wpa_supplicant/wpa_supplicant.c-old   2008-09-20 22:37:09.000000000 -0400
++++ wpa_supplicant-0.6.6/wpa_supplicant/wpa_supplicant.c       2008-09-20 22:37:43.000000000 -0400
+@@ -1118,10 +1118,10 @@
+ 
+               if (assoc_failed) {
+                       /* give IBSS a bit more time */
+-                      timeout = ssid->mode ? 10 : 5;
++                      timeout = ssid->mode ? 5 : 2;
+               } else if (wpa_s->conf->ap_scan == 1) {
+                       /* give IBSS a bit more time */
+-                      timeout = ssid->mode ? 20 : 10;
++                      timeout = ssid->mode ? 7 : 3;
+               }
                wpa_supplicant_req_auth_timeout(wpa_s, timeout, 0);
+       }