colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

device: make device stage2 reentrant for NMDeviceBridge

Browse Source
This commit is contained in:
Thomas Haller
2020-02-28 16:11:19 +01:00
parent ea3912b70b
commit 7af61e2aa0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/devices/nm-device-bridge.c
View File

@@ -532,7 +532,7 @@ _bt_register_bridge_cb (GError *error,
return; return;
} }
nm_device_activate_schedule_stage3_ip_config_start (NM_DEVICE (self)); nm_device_activate_schedule_stage2_device_config (NM_DEVICE (self), FALSE);
} }
void void
@@ -578,6 +578,9 @@ act_stage2_config (NMDevice *device, NMDeviceStateReason *out_failure_reason)
if (self->bt_cancellable) if (self->bt_cancellable)
return NM_ACT_STAGE_RETURN_POSTPONE; return NM_ACT_STAGE_RETURN_POSTPONE;
if (self->bt_registered)
return NM_ACT_STAGE_RETURN_POSTPONE;
self->bt_cancellable = g_cancellable_new (); self->bt_cancellable = g_cancellable_new ();
if (!nm_bt_vtable_network_server->register_bridge (nm_bt_vtable_network_server, if (!nm_bt_vtable_network_server->register_bridge (nm_bt_vtable_network_server,
nm_setting_bluetooth_get_bdaddr (s_bt), nm_setting_bluetooth_get_bdaddr (s_bt),