summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Espy <espy@canonical.com>2016-06-16 15:07:33 -0400
committerThomas Haller <thaller@redhat.com>2016-06-25 10:32:24 +0200
commit899d7e5cb1eb3bddaf92de3644c49c9f634b675e (patch)
treeff2be35ac8edb653fbc3db0250a79676e0a3cb03
parenteed8fd2e43d244caa856d9993e750ff19ba62fd7 (diff)
wifi: clear WiFi requested_scan if suppl exits
It's possible for wpa_supplicant to exit with an outstanding requested_scan pending. This can lead to a stall condition where scanning no longer occurs. https://mail.gnome.org/archives/networkmanager-list/2016-June/msg00117.html
-rw-r--r--src/devices/wifi/nm-device-wifi.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index 4f04693688..781ecb7e36 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -247,6 +247,11 @@ supplicant_interface_release (NMDeviceWifi *self)
priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
+ if (priv->requested_scan) {
+ priv->requested_scan = FALSE;
+ nm_device_remove_pending_action (NM_DEVICE (self), "scan", TRUE);
+ }
+
nm_clear_g_source (&priv->pending_scan_id);
/* Reset the scan interval to be pretty frequent when disconnected */