From af32e2da4c5bb3a14a3f42a3a2d687025323430f Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 29 Aug 2022 09:08:40 +0200 Subject: [PATCH] device: don't emit recheck-assume if there is a queued activation request If there is a queued activation request waiting (e.g. for carrier), we shouldn't generate a new connection. Fixes-test: dracut_NM_vlan_over_team_no_boot --- src/core/devices/nm-device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index 41b4c9b92b..22aadc5a28 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -8960,7 +8960,7 @@ nm_device_emit_recheck_assume(gpointer user_data) priv = NM_DEVICE_GET_PRIVATE(self); priv->recheck_assume_id = 0; - if (!nm_device_get_act_request(self)) + if (!priv->queued_act_request && !nm_device_get_act_request(self)) g_signal_emit(self, signals[RECHECK_ASSUME], 0); return G_SOURCE_REMOVE;