NetworkManager r3368 - trunk/src

[dcbw svn gnome org]

Author: dcbw
Date: Fri Feb 29 17:07:46 2008
New Revision: 3368
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3368&view=rev

Log:
Clamp scan interval to 120s

Modified:
   trunk/src/nm-device-802-11-wireless.c

Modified: trunk/src/nm-device-802-11-wireless.c
==============================================================================
--- trunk/src/nm-device-802-11-wireless.c	(original)
+++ trunk/src/nm-device-802-11-wireless.c	Fri Feb 29 17:07:46 2008
@@ -1528,6 +1528,8 @@
 				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);
 		}
 	}
 }