diff options
| author | Michael Biebl <biebl@debian.org> | 2016-08-26 02:19:30 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-08-26 02:19:30 +0200 |
| commit | 229bfa11c4d56b4c1017c81c7dbafbedd15e3153 (patch) | |
| tree | edfc7357b6494a5c0cb016bb88d61b623daa9876 /src/nm-activation-request.c | |
| parent | 6318db9c78b4fe207dfe700cfac11a675fc63dc9 (diff) | |
| parent | 7514efc2f38c9ace4557d4e69d68e7d380389030 (diff) | |
Merge tag 'upstream/1.4.0'
Upstream version 1.4.0
Diffstat (limited to 'src/nm-activation-request.c')
| -rw-r--r-- | src/nm-activation-request.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c index acc3e4ca..22fa5b69 100644 --- a/src/nm-activation-request.c +++ b/src/nm-activation-request.c @@ -445,9 +445,9 @@ master_failed (NMActiveConnection *self) if (device) { device_state = nm_device_get_state (device); if (nm_device_is_activating (device) || (device_state == NM_DEVICE_STATE_ACTIVATED)) { - nm_device_state_changed (device, - NM_DEVICE_STATE_FAILED, - NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED); + nm_device_queue_state (device, + NM_DEVICE_STATE_FAILED, + NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED); return; } } |