X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/56d7991b6076e383dd3a87947ad7bf789b0536a7..0bd45e87d91cc618487a629910a025767cfae4a1:/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 8c6210da1..9e54eb510 100644
--- a/package/wpa_supplicant/patches/110-roaming.patch
+++ b/package/wpa_supplicant/patches/110-roaming.patch
@@ -1,9 +1,7 @@
 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
-===================================================================
---- 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 @@
+--- a/wpa_supplicant/events.c
++++ b/wpa_supplicant/events.c
+@@ -849,7 +849,7 @@ static void wpa_supplicant_event_assoc(s
  		wpa_supplicant_set_state(wpa_s, WPA_COMPLETED);
  	} else if (!ft_completed) {
  		/* Timeout for receiving the first EAPOL packet */
@@ -12,40 +10,37 @@ 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
-===================================================================
---- 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 @@
- 		return;
+--- a/wpa_supplicant/scan.c
++++ b/wpa_supplicant/scan.c
+@@ -189,6 +189,7 @@ static void wpa_supplicant_scan(void *el
  	}
+ #endif /* CONFIG_WPS */
  
 +	wpa_drv_flush_pmkid(wpa_s);
  	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 @@
+@@ -203,7 +204,7 @@ static void wpa_supplicant_scan(void *el
  
  	if (ret) {
  		wpa_printf(MSG_WARNING, "Failed to initiate AP scan.");
 -		wpa_supplicant_req_scan(wpa_s, 10, 0);
 +		wpa_supplicant_req_scan(wpa_s, 3, 0);
- 	}
+ 	} else
+ 		wpa_s->scan_runs++;
  }
+--- a/wpa_supplicant/wpa_supplicant.c
++++ b/wpa_supplicant/wpa_supplicant.c
+@@ -1160,10 +1160,10 @@ void wpa_supplicant_associate(struct wpa
  
-Index: wpa_supplicant-0.6.3/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;
+ 		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);
+ 	}