diff options
| author | Francesco Giudici <fgiudici@redhat.com> | 2017-05-05 16:34:06 +0200 |
|---|---|---|
| committer | Francesco Giudici <fgiudici@redhat.com> | 2017-05-05 16:34:06 +0200 |
| commit | ca5ae98338affc46179658f069aa038897e291c3 (patch) | |
| tree | 15e00c2f2ff57d0bca90327f9d4f0ce4b923af89 | |
| parent | ad35fbf3a33185e40a55245326dc22dbd499c90b (diff) | |
| download | NetworkManager-ca5ae98338affc46179658f069aa038897e291c3.tar.gz | |
Revert "nm-manager: try assuming connections on managed devices"fg/temp2
This reverts commit acf1067a455b02b60985e209df568d3fcc3fac9e.
| -rw-r--r-- | src/nm-manager.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c index d646e23ff7..093a2a4fd3 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1852,7 +1852,6 @@ recheck_assume_connection (NMManager *self, gboolean was_unmanaged = FALSE; gboolean generated = FALSE; NMDeviceState state; - NMDeviceSysIfaceState if_state; g_return_val_if_fail (NM_IS_MANAGER (self), FALSE); g_return_val_if_fail (NM_IS_DEVICE (device), FALSE); @@ -1867,10 +1866,7 @@ recheck_assume_connection (NMManager *self, if (state > NM_DEVICE_STATE_DISCONNECTED) return FALSE; - if_state = nm_device_sys_iface_state_get (device); - if (if_state == NM_DEVICE_SYS_IFACE_STATE_MANAGED) - nm_assert (!guess_assume && (assume_connection_uuid == NULL)); - else if (if_state != NM_DEVICE_SYS_IFACE_STATE_EXTERNAL) + if (nm_device_sys_iface_state_get (device) != NM_DEVICE_SYS_IFACE_STATE_EXTERNAL) return FALSE; connection = get_existing_connection (self, device, guess_assume, assume_connection_uuid, &generated); |