From 52e9600f039da05a5e0cf6d19552cee9fb034bb6 Mon Sep 17 00:00:00 2001 From: Wen Liang Date: Mon, 21 Aug 2023 14:11:28 -0400 Subject: [PATCH] Revert "nm-policy: stop rechecking autoactivation if device is unregistered" When we register the auto-activate, the device has to be registered in NMPolicy, the assertion is correct and ensure that. This reverts commit 712729f6523f2e41a6c78e9a4f4d36a17d9464bd. --- src/core/nm-policy.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/core/nm-policy.c b/src/core/nm-policy.c index 024f76546..efdb06360 100644 --- a/src/core/nm-policy.c +++ b/src/core/nm-policy.c @@ -1662,15 +1662,14 @@ nm_policy_device_recheck_auto_activate_schedule(NMPolicy *self, NMDevice *device g_return_if_fail(NM_IS_POLICY(self)); g_return_if_fail(NM_IS_DEVICE(device)); - if (g_signal_handler_find(device, - G_SIGNAL_MATCH_DATA, - 0, - 0, - NULL, - NULL, - NM_POLICY_GET_PRIVATE(self)) - == 0) - return; + nm_assert(g_signal_handler_find(device, + G_SIGNAL_MATCH_DATA, + 0, + 0, + NULL, + NULL, + NM_POLICY_GET_PRIVATE(self)) + != 0); if (!c_list_is_empty(&device->policy_auto_activate_lst)) { /* already queued. Return. */