diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2014-12-03 14:47:44 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2014-12-11 11:46:43 +0100 |
| commit | 55af4add90bfcbb13f2b461f51963737f330e210 (patch) | |
| tree | 177eafe906fc7d42aeb797d721700c600c07039a | |
| parent | 063ab8da5cb50fbca9f134aa15c7927035b5036c (diff) | |
| download | NetworkManager-55af4add90bfcbb13f2b461f51963737f330e210.tar.gz | |
device: don't disconnect assumed connections
Transition them to activated status when they fail.
https://bugzilla.redhat.com/show_bug.cgi?id=1141264
| -rw-r--r-- | src/devices/nm-device.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index e366e1dec9..c260fc81bf 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -7465,6 +7465,14 @@ _set_state_full (NMDevice *self, nm_dispatcher_call (DISPATCHER_ACTION_UP, nm_act_request_get_connection (req), self, NULL, NULL, NULL); break; case NM_DEVICE_STATE_FAILED: + if (nm_device_uses_assumed_connection (self)) { + /* Avoid tearing down assumed connection, assume it's connected */ + nm_device_queue_state (self, + NM_DEVICE_STATE_ACTIVATED, + NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED); + break; + } + connection = nm_device_get_connection (self); _LOGW (LOGD_DEVICE | LOGD_WIFI, "Activation: failed for connection '%s'", |