diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-10-06 14:18:48 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-10-06 14:18:55 +0200 |
| commit | ad3577b3acef8207d26f5117dd2aee9bbf4a0882 (patch) | |
| tree | 646555b092a02a0a322ab010e33dab7f28f6d940 | |
| parent | a9d233b4fe19f7497ae97b4a898b6e6f2ec64167 (diff) | |
| download | NetworkManager-ad3577b3acef8207d26f5117dd2aee9bbf4a0882.tar.gz | |
device: assert that master-ready handler is not scheduled in schedule_stage2_device_config()
| -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 b2e9076492..b082d2848f 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); |