From 7af61e2aa00eacd77bf20bcc2766ee7cdac6137b Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 28 Feb 2020 16:11:19 +0100 Subject: [PATCH] device: make device stage2 reentrant for NMDeviceBridge --- src/devices/nm-device-bridge.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c index 5eaf5a98c..874d4966e 100644 --- a/src/devices/nm-device-bridge.c +++ b/src/devices/nm-device-bridge.c @@ -532,7 +532,7 @@ _bt_register_bridge_cb (GError *error, return; } - nm_device_activate_schedule_stage3_ip_config_start (NM_DEVICE (self)); + nm_device_activate_schedule_stage2_device_config (NM_DEVICE (self), FALSE); } void @@ -578,6 +578,9 @@ act_stage2_config (NMDevice *device, NMDeviceStateReason *out_failure_reason) if (self->bt_cancellable) return NM_ACT_STAGE_RETURN_POSTPONE; + if (self->bt_registered) + return NM_ACT_STAGE_RETURN_POSTPONE; + self->bt_cancellable = g_cancellable_new (); if (!nm_bt_vtable_network_server->register_bridge (nm_bt_vtable_network_server, nm_setting_bluetooth_get_bdaddr (s_bt),