fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-26 15:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: assert that master-ready handler is not scheduled in schedule_stage2_device_config()

Browse source 
(cherry picked from commit c41be469ab)
This commit is contained in:
Thomas Haller 2015-10-06 14:18:48 +02:00
parent 7828003bf8
commit 4e0882e923
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/devices/nm-device.c
View file

@ -2859,9 +2859,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);