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

[Tony Espy]

This patch fixes a race condition in NMDeviceWiFi's scanning logic.
It's possible for cancel_pending_scan() to be called when an actual
supplicant scan is pending, which can cause scanning to stall,
effectively preventing the device from re-connecting to WiFi.

[lp:~phablet-team/network-manager/wifi-fix-cancel-scan]

973. By Tony Espy on 2016-03-09

* d/p/lp1099983_ignore-p2p-wifi-devices.patch: updated to ignore
  all p2p devices ( not just p2p0 ), as some drivers dynamically
  create differently named p2p devices which are managed externally
  in the case of WiFi Direct usage.
* d/p/lp1099983_ignore-p2p-wifi-devices.patch: refreshed

974. By Tony Espy on 2016-03-12

d/p/wifi-fix-cancel-scan.patch: add logic to supplicant_iface_state_cb
to schedule a scan if supplicant state becomes inactive, and
old_state was scanning.

975. By Tony Espy on 2016-03-14

d/p/wifi-fix-cancel-scan.patch: cancel_pending_scan, and use
request_wireless_scan instead of sched_scan to re-trigger scanning
logic when supplicant_state becomes inactive.

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

[Simon Fels (morphis)]

LGTM

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-10-02 14:56:14 +0000
+++ debian/changelog	2016-03-15 23:32:40 +0000
@@ -1,3 +1,23 @@
+network-manager (0.9.10.0-4ubuntu15.1.10) UNRELEASED; urgency=medium
+
+  [ Vicamo Yang ]
+  * d/p/wifi-fix-cancel-scan.patch: This patch fixes a race condition
+    in NMDeviceWiFi's scanning logic which can cause scanning to
+    stall, leading to a situation where the device never re-connects
+    to WiFi.
+
+  [ Tony Espy ]
+  * d/p/lp1099983_ignore-p2p-wifi-devices.patch: updated to ignore
+    all p2p devices ( not just p2p0 ), as some drivers dynamically
+    create differently named p2p devices which are managed externally
+    in the case of WiFi Direct usage.
+  * d/p/lp1099983_ignore-p2p-wifi-devices.patch: refreshed
+  * d/p/wifi-fix-cancel-scan.patch: add logic to supplicant_iface_state_cb
+    to schedule a scan if supplicant state becomes inactive, and
+    old_state was scanning.
+
+ -- Tony Espy <[e-mail]>  Sat, 12 Mar 2016 15:37:31 -0500
+
 network-manager (0.9.10.0-4ubuntu15.1.8) vivid; urgency=medium
 
   * d/p/0002-wifi-cull-the-scan-list-before-signalling-ScanDone-b.patch:

=== modified file 'debian/patches/ignore_rfkill_if_urfkill_is_present.patch'
--- debian/patches/ignore_rfkill_if_urfkill_is_present.patch	2014-11-18 22:46:35 +0000
+++ debian/patches/ignore_rfkill_if_urfkill_is_present.patch	2016-03-15 23:32:40 +0000
@@ -34,7 +34,7 @@
  
  	/* List of NMDeviceFactoryFunc pointers sorted in priority order */
  	GSList *factories;
-@@ -217,6 +221,7 @@ typedef struct {
+@@ -219,6 +223,7 @@ typedef struct {
  	gboolean ifstate_force_online;
  
  	guint timestamp_update_id;
@@ -42,7 +42,7 @@
  
  	gboolean startup;
  } NMManagerPrivate;
-@@ -670,7 +675,20 @@ find_unmanaged_state (NMManager *manager
+@@ -673,7 +678,20 @@ find_unmanaged_state (NMManager *manager
  		if (state == NM_DEVICE_STATE_UNMANAGED) {
  			const char *iface = nm_device_get_ip_iface (dev);
  			if (priv->ifstate_force_online) {
@@ -63,7 +63,7 @@
  				nm_log_dbg (LOGD_CORE, "Unmanaged device found: %s; state CONNECTED forced.", iface);
  			}
  		}
-@@ -4669,6 +4687,49 @@ dbus_connection_changed_cb (NMDBusManage
+@@ -4784,6 +4802,49 @@ dbus_connection_changed_cb (NMDBusManage
  
  /**********************************************************************/
  
@@ -113,7 +113,7 @@
  static NMManager *singleton = NULL;
  
  NMManager *
-@@ -4686,6 +4747,43 @@ nm_connection_provider_get (void)
+@@ -4801,6 +4862,43 @@ nm_connection_provider_get (void)
  	return NM_CONNECTION_PROVIDER (NM_MANAGER_GET_PRIVATE (singleton)->settings);
  }
  
@@ -157,7 +157,7 @@
  NMManager *
  nm_manager_new (NMSettings *settings,
                  const char *state_file,
-@@ -4777,13 +4875,35 @@ nm_manager_new (NMSettings *settings,
+@@ -4892,13 +4990,35 @@ nm_manager_new (NMSettings *settings,
  	                  G_CALLBACK (rfkill_manager_rfkill_changed_cb),
  	                  singleton);
  

=== modified file 'debian/patches/lp1099983_ignore-p2p-wifi-devices.patch'
--- debian/patches/lp1099983_ignore-p2p-wifi-devices.patch	2015-02-27 00:29:09 +0000
+++ debian/patches/lp1099983_ignore-p2p-wifi-devices.patch	2016-03-15 23:32:40 +0000
@@ -2,23 +2,24 @@
 Subject: Ignore p2p0 wifi devices from android.
 
 ---
- src/nm-manager.c |   10 ++++++++++
- 1 file changed, 10 insertions(+)
+ src/nm-manager.c |   11 +++++++++++
+ 1 file changed, 11 insertions(+)
 
-Index: network-manager-0.9.10.0/src/nm-manager.c
+Index: b/src/nm-manager.c
 ===================================================================
---- network-manager-0.9.10.0.orig/src/nm-manager.c
-+++ network-manager-0.9.10.0/src/nm-manager.c
-@@ -2060,6 +2060,16 @@ platform_link_added (NMManager *self,
+--- a/src/nm-manager.c
++++ b/src/nm-manager.c
+@@ -2151,6 +2151,17 @@ platform_link_added (NMManager *self,
  		!strncmp (plink->name, "ccmni", STRLEN ("ccmni")))
  		return;
  
 +	/*
-+	 * Ubuntu: Explicitly unmanage p2p Wi-Fi devices exposed by Android JB Wi-Fi drivers.
++	 * Ubuntu: Explicitly unmanage all p2p Wi-Fi devices which are
++	 * managed externally in the case of Wi-Fi Direct.
 +	 */
 +	NMDeviceType devtype = nm_device_get_device_type (device);
 +	if ((plink->type == NM_LINK_TYPE_WIFI)
-+	    && !strncmp (plink->name, "p2p0", STRLEN ("p2p0"))) {
++	    && !strncmp (plink->name, "p2p", STRLEN ("p2p"))) {
 +		nm_log_info (LOGD_HW, "(%s): ignoring P2P wireless iface", plink->name);
 +		return;
 +	}

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-10-01 21:39:53 +0000
+++ debian/patches/series	2016-03-15 23:32:40 +0000
@@ -76,3 +76,4 @@
 lp1444162-add-ip6-config-to-nm-ofono-connections.patch
 fix-ofono-plugin-leaks.patch
 rm-scofono-plugin-dbus.patch
+wifi-fix-cancel-scan.patch

=== added file 'debian/patches/wifi-fix-cancel-scan.patch'
--- debian/patches/wifi-fix-cancel-scan.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/wifi-fix-cancel-scan.patch	2016-03-15 23:32:40 +0000
@@ -0,0 +1,119 @@
+From: Vicamo Yang <[e-mail]>
+Date: Tue, 11 Jan 2016 18:40:30 -0500
+Subject: [PATCH] wwan: add support for using oFono as a modem manager
+
+This patch fixes a race condition in NMDeviceWiFi's scanning logic.
+It's possible for cancel_pending_scan() to be called when an actual
+supplicant scan is pending, which can cause scanning to stall,
+effectively preventing the device from re-connecting to WiFi.
+
+---
+ src/devices/wifi/nm-device-wifi.c |   44 +++++++++++++++++++++++++++++++-------
+ src/nm-policy.c                   |    4 ++-
+ 2 files changed, 39 insertions(+), 9 deletions(-)
+
+Index: b/src/devices/wifi/nm-device-wifi.c
+===================================================================
+--- a/src/devices/wifi/nm-device-wifi.c
++++ b/src/devices/wifi/nm-device-wifi.c
+@@ -774,8 +774,10 @@ deactivate (NMDevice *dev)
+ 
+ 	/* Ensure we trigger a scan after deactivating a Hotspot */
+ 	if (old_mode == NM_802_11_MODE_AP) {
+-		cancel_pending_scan (self);
+-		request_wireless_scan (self);
++		if (!priv->requested_scan) {
++			cancel_pending_scan (self);
++			request_wireless_scan (self);
++		}
+ 	}
+ }
+ 
+@@ -1236,6 +1238,7 @@ request_scan_cb (NMDevice *device,
+                  gpointer user_data)
+ {
+ 	NMDeviceWifi *self = NM_DEVICE_WIFI (device);
++	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
+ 	GError *local = NULL;
+ 
+ 	if (error) {
+@@ -1252,8 +1255,10 @@ request_scan_cb (NMDevice *device,
+ 		return;
+ 	}
+ 
+-	cancel_pending_scan (self);
+-	request_wireless_scan (self);
++	if (!priv->requested_scan) {
++		cancel_pending_scan (self);
++		request_wireless_scan (self);
++	}
+ 	dbus_g_method_return (context);
+ }
+ 
+@@ -2139,8 +2144,13 @@ supplicant_iface_state_cb (NMSupplicantI
+ 		            nm_device_get_iface (device));
+ 
+ 		/* Request a scan to get latest results */
+-		cancel_pending_scan (self);
+-		request_wireless_scan (self);
++		if (!priv->requested_scan) {
++			/* Scan request should have been issued in nm_device_state_changed if
++			 * the device was previously unavailable.
++			 */
++			cancel_pending_scan (self);
++			request_wireless_scan (self);
++		}
+ 
+ 		if (old_state < NM_SUPPLICANT_INTERFACE_STATE_READY)
+ 			nm_device_remove_pending_action (device, "waiting for supplicant", TRUE);
+@@ -2219,6 +2229,22 @@ supplicant_iface_state_cb (NMSupplicantI
+ 		                         NM_DEVICE_STATE_UNAVAILABLE,
+ 		                         NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED);
+ 		break;
++	case NM_SUPPLICANT_INTERFACE_STATE_INACTIVE:
++		if (old_state == NM_SUPPLICANT_INTERFACE_STATE_SCANNING) {
++			nm_log_warn (LOGD_HW | LOGD_WIFI, "(%s): supplicant state: SCANNING -> INACTIVE",
++						nm_device_get_iface (NM_DEVICE (self)));
++
++			if (priv->requested_scan) {
++				nm_log_dbg (LOGD_WIFI_SCAN, "(%s): clearing requested_scan",
++							nm_device_get_iface (NM_DEVICE (self)));
++
++				priv->requested_scan = FALSE;
++			}
++
++			cancel_pending_scan (self);
++			request_wireless_scan (self);
++		}
++
+ 	default:
+ 		break;
+ 	}
+@@ -3109,8 +3135,10 @@ device_state_changed (NMDevice *device,
+ 	case NM_DEVICE_STATE_DISCONNECTED:
+ 		/* Kick off a scan to get latest results */
+ 		priv->scan_interval = SCAN_INTERVAL_MIN;
+-		cancel_pending_scan (self);
+-		request_wireless_scan (self);
++		if (!priv->requested_scan) {
++			cancel_pending_scan (self);
++			request_wireless_scan (self);
++		}
+ 		break;
+ 	default:
+ 		break;
+Index: b/src/nm-policy.c
+===================================================================
+--- a/src/nm-policy.c
++++ b/src/nm-policy.c
+@@ -1034,7 +1034,9 @@ auto_activate_device (gpointer user_data
+ 			g_error_free (error);
+ 		}
+ 		g_object_unref (subject);
+-	}
++	} else
++		nm_log_dbg (LOGD_DEVICE, "auto_activate_connection: no best_connection found for '%s'!",
++					nm_device_get_iface (data->device));
+ 
+ 	g_slist_free (connections);
+