From 41c09c229cb67fdefa37b088b87551ec6354ac83 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Fri, 29 Feb 2008 17:07:46 +0000
Subject: [PATCH] Clamp scan interval to 120s

git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3368 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
---
 src/nm-device-802-11-wireless.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c
index 560df3409e..1467d9e05e 100644
--- a/src/nm-device-802-11-wireless.c
+++ b/src/nm-device-802-11-wireless.c
@@ -1528,6 +1528,8 @@ schedule_scan (NMDevice80211Wireless *self, gboolean backoff)
 				priv->scan_interval += (SCAN_INTERVAL_STEP / factor);
 				/* Ensure the scan interval will never be less than 20s... */
 				priv->scan_interval = MAX(priv->scan_interval, SCAN_INTERVAL_MIN + SCAN_INTERVAL_STEP);
+				/* ... or more than 120s */
+				priv->scan_interval = MIN(priv->scan_interval, SCAN_INTERVAL_MAX);
 		}
 	}
 }