[patch] Disables background scanning once connected to a AP

networkmanager-0.8-disable-background-scanning.patch (text/plain), 1.49 KB, created by Dereck on 2010-03-06 23:37:20 UTC

diff -Naur NetworkManager-0.8/src/nm-device-wifi.c NetworkManager-0.8-dev/src/nm-device-wifi.c
--- NetworkManager-0.8/src/nm-device-wifi.c	2010-02-18 10:47:45.000000000 -0500
+++ NetworkManager-0.8-dev/src/nm-device-wifi.c	2010-03-06 17:11:55.367609260 -0500
@@ -1036,8 +1036,9 @@
 
 	if (nm_supplicant_interface_get_scanning (priv->supplicant.iface))
 		goto out;
-
-	periodic_update (self);
+	if (state != NM_DEVICE_STATE_ACTIVATED) {
+		periodic_update (self);
+	}
 
 out:
 	return TRUE;
@@ -1789,16 +1790,23 @@
 	NMDeviceWifi *self = NM_DEVICE_WIFI (user_data);
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
 	gboolean backoff = FALSE;
+	NMDeviceState state;
+
+	state = nm_device_get_state (NM_DEVICE (self));
 
 	if (check_scanning_allowed (self)) {
 		if (nm_supplicant_interface_request_scan (priv->supplicant.iface)) {
-			/* success */
-			backoff = TRUE;
+			if ((state == NM_DEVICE_STATE_ACTIVATED) || (nm_supplicant_interface_request_scan (priv->supplicant.iface))) {
+				/* success */
+				backoff = TRUE;
+			}
 		}
 	}
 
 	priv->pending_scan_id = 0;
-	schedule_scan (self, backoff);
+	if ((state == NM_DEVICE_STATE_ACTIVATED) || (nm_supplicant_interface_request_scan (priv->supplicant.iface))) {
+		schedule_scan (self, backoff);
+	}
 	return FALSE;
 }
 
@@ -1845,7 +1853,7 @@
 			/* Invalid combination; would cause continual rescheduling of
 			 * the scan and hog CPU.  Reset to something minimally sane.
 			 */
-			priv->scan_interval = 5;
+			priv->scan_interval = 1;
 		}
 	}
 }