From 7e15b4d5621fbf4b65c27d25841ee759c39fac52 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 28 Apr 2023 12:59:49 +0200
Subject: [PATCH] core: return whether anything changed from
 nm_manager_devcon_autoconnect_retries_reset()

---
 src/core/nm-manager.c | 24 +++++++++++++++---------
 src/core/nm-manager.h |  6 +++---
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c
index 6d8245c7d8..c6cf2cb943 100644
--- a/src/core/nm-manager.c
+++ b/src/core/nm-manager.c
@@ -1270,7 +1270,7 @@ _autoconnect_retries_initial(NMSettingsConnection *sett_conn)
     return (guint32) retries;
 }
 
-static void
+static gboolean
 _autoconnect_retries_set(NMManager *self, DevConData *data, guint32 retries, gboolean is_reset)
 {
     gboolean changed = FALSE;
@@ -1313,6 +1313,8 @@ _autoconnect_retries_set(NMManager *self, DevConData *data, guint32 retries, gbo
                                                       " (blocked for %d sec)",
                                                       AUTOCONNECT_RESET_RETRIES_TIMER_SEC));
     }
+
+    return changed;
 }
 
 /**
@@ -1358,28 +1360,32 @@ nm_manager_devcon_autoconnect_retries_set(NMManager            *self,
                              FALSE);
 }
 
-void
+gboolean
 nm_manager_devcon_autoconnect_retries_reset(NMManager            *self,
                                             NMDevice             *device,
                                             NMSettingsConnection *sett_conn)
 {
     DevConData *data;
     guint32     retries_initial;
+    gboolean    changed = FALSE;
 
     nm_assert(NM_IS_SETTINGS_CONNECTION(sett_conn));
 
     retries_initial = _autoconnect_retries_initial(sett_conn);
 
     if (device) {
-        _autoconnect_retries_set(self,
-                                 _devcon_lookup_data(self, device, sett_conn, TRUE, FALSE),
-                                 retries_initial,
-                                 TRUE);
-        return;
+        return _autoconnect_retries_set(self,
+                                        _devcon_lookup_data(self, device, sett_conn, TRUE, FALSE),
+                                        retries_initial,
+                                        TRUE);
     }
 
-    c_list_for_each_entry (data, &sett_conn->devcon_con_lst_head, con_lst)
-        _autoconnect_retries_set(self, data, retries_initial, TRUE);
+    c_list_for_each_entry (data, &sett_conn->devcon_con_lst_head, con_lst) {
+        if (_autoconnect_retries_set(self, data, retries_initial, TRUE))
+            changed = TRUE;
+    }
+
+    return changed;
 }
 
 /**
diff --git a/src/core/nm-manager.h b/src/core/nm-manager.h
index caa83e4546..3028eb7ebe 100644
--- a/src/core/nm-manager.h
+++ b/src/core/nm-manager.h
@@ -243,9 +243,9 @@ void nm_manager_devcon_autoconnect_retries_set(NMManager            *self,
                                                NMSettingsConnection *sett_conn,
                                                guint32               retries);
 
-void nm_manager_devcon_autoconnect_retries_reset(NMManager            *self,
-                                                 NMDevice             *device,
-                                                 NMSettingsConnection *sett_conn);
+gboolean nm_manager_devcon_autoconnect_retries_reset(NMManager            *self,
+                                                     NMDevice             *device,
+                                                     NMSettingsConnection *sett_conn);
 
 gboolean nm_manager_devcon_autoconnect_reset_reconnect_all(NMManager            *self,
                                                            NMDevice             *device,