[PATCH] Reduce Scan Timeout (in 0.6.6)

[Dan Langlois <dan clockwerk net>]

We last left the discussion with this:
http://mail.gnome.org/archives/networkmanager-list/2009-January/msg00250.html

This patch reduces the scan timeout from 10 seconds to 8.  This is the simplest and most conservative fix, which seems most appropriate since it applies to the older 0.6.6 NM source.  I created the patch with "bzr diff" and have attached it rather than pasting inline as I'm not sure what word-wrapping and other mangling gmail may inflict upon the patch.


Since my last post I've been running my Hardy Heron with this patch and have not seen my reported problem since.  I would like to see this simple fix integrated into 0.6.6 and pulled down by any and all who still use that code base (e.g. Hardy Heron).  However, since I run Hardy myself, I could only use/test my fix on Hardy, so my patch applies against  NM 0.6.6-0ubuntu5.8.04.1.  Should we start by patching this version and send it upstream after getting any feedback?

Dan Williams, Alexander Sack, do either of you have thoughts about where this patch should be applied and how it should be distributed?

cheers,
Dan


--- src/nm-device-802-11-wireless.c	2008-03-05 09:50:55 +0000
+++ src/nm-device-802-11-wireless.c	2009-01-27 23:49:47 +0000
@@ -2110,7 +2110,7 @@
 			nm_warning ("(%s): could not trigger wireless scan", iface);
 			goto reschedule;
 		}
-		schedule_scan_results_timeout (self, 10);
+		schedule_scan_results_timeout (self, 8);
 	} else {
 		NMSock *sk = NULL;
 		struct iwreq wrq;
@@ -2130,7 +2130,7 @@
 			nm_warning ("(%s): could not trigger wireless scan: %s", iface, strerror (errno));
 			goto reschedule;
 		}
-		schedule_scan_results_timeout (self, 10);
+		schedule_scan_results_timeout (self, 8);
 	}
 	return FALSE;