fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-07 04:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: recheck_assume_connection() do nothing if the device is not disconnected

Browse source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2014-08-01 22:46:49 +02:00
parent c9ece92a48
commit 54f6666c66
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/nm-manager.c
View file

@ -1652,6 +1652,7 @@ recheck_assume_connection (NMDevice *device, gpointer user_data)
NMManager *self = NM_MANAGER (user_data);
NMConnection *connection;
gboolean was_unmanaged = FALSE, success, generated;
NMDeviceState state;
if (manager_sleeping (self))
return FALSE;
@ -1665,7 +1666,12 @@ recheck_assume_connection (NMDevice *device, gpointer user_data)
return FALSE;
}
if (nm_device_get_state (device) == NM_DEVICE_STATE_UNMANAGED) {
state = nm_device_get_state (device);
if (state > NM_DEVICE_STATE_DISCONNECTED)
return FALSE;
if (state == NM_DEVICE_STATE_UNMANAGED) {
was_unmanaged = TRUE;
nm_device_state_changed (device,
NM_DEVICE_STATE_UNAVAILABLE,