From: Jouni Malinen <j@w1.fi>
Date: Tue, 26 Jun 2012 16:51:06 +0000 (+0300)
Subject: Fix autoscan exponential to limit interval in all cases
X-Git-Tag: hostap_2_0~597
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=460b36d0c0c30c42ed5337378959a88e9a108213;p=thirdparty%2Fhostap.git

Fix autoscan exponential to limit interval in all cases

The first time the limit is exceeded could result in using larger
value - avoid that by limiting the interval also in that case.

Signed-hostap: Jouni Malinen <j@w1.fi>
---

diff --git a/wpa_supplicant/autoscan_exponential.c b/wpa_supplicant/autoscan_exponential.c
index 4f743fd14..424477be8 100644
--- a/wpa_supplicant/autoscan_exponential.c
+++ b/wpa_supplicant/autoscan_exponential.c
@@ -86,8 +86,11 @@ static int autoscan_exponential_notify_scan(void *priv,
 
 	if (data->interval <= 0)
 		data->interval = data->base;
-	else
+	else {
 		data->interval = data->interval * data->base;
+		if (data->interval > data->limit)
+			return data->limit;
+	}
 
 	return data->interval;
 }