mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-30 17:50:14 +01:00
wifi: fix stalls in scanning
https://mail.gnome.org/archives/networkmanager-list/2016-June/msg00055.html
https://bugzilla.redhat.com/show_bug.cgi?id=1362165
(cherry picked from commit 8e07ea351d)
This commit is contained in:
commit
99e34d7579
1 changed files with 10 additions and 0 deletions
|
|
@ -246,6 +246,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 */
|
||||
|
|
@ -1951,6 +1956,11 @@ supplicant_iface_state_cb (NMSupplicantInterface *iface,
|
|||
else
|
||||
_LOGI (LOGD_DEVICE | LOGD_WIFI, "supplicant interface keeps failing, giving up");
|
||||
break;
|
||||
case NM_SUPPLICANT_INTERFACE_STATE_INACTIVE:
|
||||
priv->requested_scan = FALSE;
|
||||
nm_clear_g_source (&priv->pending_scan_id);
|
||||
request_wireless_scan (self, NULL);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue