diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-10-06 14:18:48 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-10-06 17:35:13 +0200 |
| commit | c41be469ab107ea2b4813bf28a1618572b78aa6a (patch) | |
| tree | 6368b00a4c7fe1b2b01ba3a38fba8f59385eb9f8 | |
| parent | 7bbc090387d6a1c519c92d957f5746faffb9325c (diff) | |
| download | NetworkManager-c41be469ab107ea2b4813bf28a1618572b78aa6a.tar.gz | |
device: assert that master-ready handler is not scheduled in schedule_stage2_device_config()baserock/1.1.0-dev-1952-gc41be46
| -rw-r--r-- | src/devices/nm-device.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index a862fe47a4..0bede2c3d3 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -3056,9 +3056,10 @@ nm_device_activate_schedule_stage2_device_config (NMDevice *self) if (!priv->master_ready_handled) { NMActiveConnection *active = NM_ACTIVE_CONNECTION (priv->act_request); - if (!nm_active_connection_get_master (active)) + if (!nm_active_connection_get_master (active)) { + g_warn_if_fail (!priv->master_ready_id); priv->master_ready_handled = TRUE; - else { + } else { /* If the master connection is ready for slaves, attach ourselves */ if (nm_active_connection_get_master_ready (active)) master_ready (self, active); |