diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-10-16 15:07:57 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-12-11 10:21:39 -0600 |
| commit | fb9155de443d2bc2c35aa140dd3baa38b2e009f0 (patch) | |
| tree | c844bc81bf73df0ed32d8cbec1e8efbb19f43f29 | |
| parent | 726a78d29e578d77ef3541d35c8ce793680c7c49 (diff) | |
| download | NetworkManager-fb9155de443d2bc2c35aa140dd3baa38b2e009f0.tar.gz | |
fixup! core: create devices first and realize them later
| -rw-r--r-- | src/nm-active-connection.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c index d0b5b8753f..2a8f53ace1 100644 --- a/src/nm-active-connection.c +++ b/src/nm-active-connection.c @@ -516,6 +516,7 @@ master_state_cb (NMActiveConnection *master, { NMActiveConnection *self = NM_ACTIVE_CONNECTION (user_data); NMActiveConnectionState master_state = nm_active_connection_get_state (master); + NMDevice *master_device = nm_active_connection_get_device (master); check_master_ready (self); @@ -523,8 +524,8 @@ master_state_cb (NMActiveConnection *master, self, master, state_to_string (master_state), master_state); if (master_state == NM_ACTIVE_CONNECTION_STATE_DEACTIVATING && - nm_active_connection_get_device (master) == NULL) { - /* Master failed without ever creating its device */ + (!master_device || !nm_device_is_real (master_device))) { + /* Master failed without ever creating or realizing its device */ if (NM_ACTIVE_CONNECTION_GET_CLASS (self)->master_failed) NM_ACTIVE_CONNECTION_GET_CLASS (self)->master_failed (self); } |