Merge lp:~phablet-team/network-manager/lp1445134-wifi-scan-fix-vivid into lp:~phablet-team/network-manager/vivid-phone-overlay

[Tony Espy]

This change restores periodic WiFi scanning, which was broken due to a mangling of a patch when NM was re-based on 0.9.10.0.

[Mathieu Trudel-Lapierre (cyphermox)]

review: Approve

[Mathieu Trudel-Lapierre (cyphermox)]

This should land in wily first though, given that it's pretty much a SRU.

[Tony Espy (awe)]

See the following MP for test results:

https://code.launchpad.net/~phablet-team/network-manager/lp1444162/+merge/267967

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-09 18:24:56 +0000
+++ debian/changelog	2015-08-05 17:15:41 +0000
@@ -1,3 +1,10 @@
+network-manager (0.9.10.0-4ubuntu15.1.7) vivid; urgency=medium
+
+  * d/p/0002-wifi-cull-the-scan-list-before-signalling-ScanDone-b.patch:
+    restore periodic WiFi scanning (LP: #1445134).
+
+ -- Tony Espy <[e-mail]>  Wed, 05 Aug 2015 12:20:43 -0400
+
 network-manager (0.9.10.0-4ubuntu15.1.6) vivid; urgency=medium
 
   * debian/patches/lp1361864-add-ofono-preferred-contexts.patch: fix

=== modified file 'debian/patches/0002-wifi-cull-the-scan-list-before-signalling-ScanDone-b.patch'
--- debian/patches/0002-wifi-cull-the-scan-list-before-signalling-ScanDone-b.patch	2015-04-20 16:29:33 +0000
+++ debian/patches/0002-wifi-cull-the-scan-list-before-signalling-ScanDone-b.patch	2015-08-05 17:15:41 +0000
@@ -14,10 +14,10 @@
  src/devices/wifi/nm-device-wifi.c |   33 +++++++++++++++++++++++++++------
  1 file changed, 27 insertions(+), 6 deletions(-)
 
-Index: b/src/devices/wifi/nm-device-wifi.c
+Index: network-manager-0.9.10.0/src/devices/wifi/nm-device-wifi.c
 ===================================================================
---- a/src/devices/wifi/nm-device-wifi.c
-+++ b/src/devices/wifi/nm-device-wifi.c
+--- network-manager-0.9.10.0.orig/src/devices/wifi/nm-device-wifi.c
++++ network-manager-0.9.10.0/src/devices/wifi/nm-device-wifi.c
 @@ -183,6 +183,10 @@ static void supplicant_iface_notify_scan
                                                   GParamSpec * pspec,
                                                   NMDeviceWifi * self);
@@ -29,7 +29,7 @@
  static void schedule_scanlist_cull (NMDeviceWifi *self);
  
  static gboolean request_wireless_scan (gpointer user_data);
-@@ -1609,14 +1613,20 @@ supplicant_iface_scan_done_cb (NMSupplic
+@@ -1609,14 +1613,22 @@ supplicant_iface_scan_done_cb (NMSupplic
  	            nm_device_get_iface (NM_DEVICE (self)),
  	            success ? "successful" : "failed");
  
@@ -51,10 +51,12 @@
 +	 * all last-seen timestamps being updated.
 +	 */
 +	g_signal_emit (self, signals[SCAN_DONE], 0, NULL);
++
++	schedule_scan (self, success);
  
  	if (priv->requested_scan) {
  		priv->requested_scan = FALSE;
-@@ -1793,8 +1803,10 @@ cull_scan_list (NMDeviceWifi *self)
+@@ -1793,8 +1805,10 @@ cull_scan_list (NMDeviceWifi *self)
  		 * supplicant in the last scan.
  		 */
  		if (   nm_ap_get_supplicant_path (ap)
@@ -66,7 +68,7 @@
  
  		last_seen = nm_ap_get_last_seen (ap);
  		if (!last_seen || last_seen + prune_interval_s < boottime_now)
-@@ -1836,13 +1848,22 @@ cull_scan_list (NMDeviceWifi *self)
+@@ -1836,13 +1850,22 @@ cull_scan_list (NMDeviceWifi *self)
  }
  
  static void