diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-02-28 16:11:19 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-03-15 09:44:50 +0100 |
| commit | c55b7e8e023967923154dfe1065730e802b420e8 (patch) | |
| tree | e28f13775ba00c9cd0f98bc0e9c9da1c943bc2b5 | |
| parent | d24b8b38151a7a54c9925ac4b5c87a37215a3019 (diff) | |
| download | NetworkManager-th/act-stage2-re-entrant.tar.gz | |
device: make device stage2 reentrant for NMDeviceBridgeth/act-stage2-re-entrant
| -rw-r--r-- | src/devices/nm-device-bridge.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c index 5eaf5a98c9..874d4966e3 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), |