diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-10-06 10:40:45 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-10-06 17:35:13 +0200 |
| commit | c5210b322dd3d5d26d3a3adb6d2ca67a3fc387e0 (patch) | |
| tree | c5de21c11d52500522c403098b3f82e353810732 | |
| parent | b0ba25cdbcfe2406b36457f94dd3e2173b0c51fa (diff) | |
| download | NetworkManager-c5210b322dd3d5d26d3a3adb6d2ca67a3fc387e0.tar.gz | |
device: fix activating master/slave devices during stage2
During stage2, if the slave detected that it would need to wait for
the master, it would return FALSE (which removes the g-idle-handler).
However, it would not clear the activation-source, so later, when
the master becomes ready, its attempt to schedule stage2 again would
result in an error-log and the idle-handler would not be scheduled
again.
Fixes: 85ac903bb8010409c4010ba09c621780b385b9b5
https://bugzilla.redhat.com/show_bug.cgi?id=1268797
https://bugzilla.redhat.com/show_bug.cgi?id=1183444
| -rw-r--r-- | src/devices/nm-device.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index d48d7e3afe..3bc6089f8c 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -2989,6 +2989,9 @@ nm_device_activate_stage2_device_config (gpointer user_data) NMActiveConnection *active = NM_ACTIVE_CONNECTION (priv->act_request); GSList *iter; + /* Clear the activation source ID now that this stage has run */ + activation_source_clear (self, FALSE, 0); + if (!priv->master_ready_handled) { if (!nm_active_connection_get_master (active)) priv->master_ready_handled = TRUE; @@ -3011,9 +3014,6 @@ nm_device_activate_stage2_device_config (gpointer user_data) } } - /* Clear the activation source ID now that this stage has run */ - activation_source_clear (self, FALSE, 0); - _LOGD (LOGD_DEVICE, "Activation: Stage 2 of 5 (Device Configure) starting..."); nm_device_state_changed (self, NM_DEVICE_STATE_CONFIG, NM_DEVICE_STATE_REASON_NONE); |