colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: return whether anything changed from nm_manager_devcon_autoconnect_retries_reset()

Browse Source
This commit is contained in:
Thomas Haller
2023-04-28 12:59:49 +02:00
parent 5492945fdc
commit 7e15b4d562
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/nm-manager.c
View File

@@ -1270,7 +1270,7 @@ _autoconnect_retries_initial(NMSettingsConnection *sett_conn)
return (guint32) retries; return (guint32) retries;
} }
static void static gboolean
_autoconnect_retries_set(NMManager *self, DevConData *data, guint32 retries, gboolean is_reset) _autoconnect_retries_set(NMManager *self, DevConData *data, guint32 retries, gboolean is_reset)
{ {
gboolean changed = FALSE; gboolean changed = FALSE;
@@ -1313,6 +1313,8 @@ _autoconnect_retries_set(NMManager *self, DevConData *data, guint32 retries, gbo
" (blocked for %d sec)", " (blocked for %d sec)",
AUTOCONNECT_RESET_RETRIES_TIMER_SEC)); AUTOCONNECT_RESET_RETRIES_TIMER_SEC));
} }
return changed;
} }
/** /**
@@ -1358,28 +1360,32 @@ nm_manager_devcon_autoconnect_retries_set(NMManager *self,
FALSE); FALSE);
} }
void gboolean
nm_manager_devcon_autoconnect_retries_reset(NMManager *self, nm_manager_devcon_autoconnect_retries_reset(NMManager *self,
NMDevice *device, NMDevice *device,
NMSettingsConnection *sett_conn) NMSettingsConnection *sett_conn)
{ {
DevConData *data; DevConData *data;
guint32 retries_initial; guint32 retries_initial;
gboolean changed = FALSE;
nm_assert(NM_IS_SETTINGS_CONNECTION(sett_conn)); nm_assert(NM_IS_SETTINGS_CONNECTION(sett_conn));
retries_initial = _autoconnect_retries_initial(sett_conn); retries_initial = _autoconnect_retries_initial(sett_conn);
if (device) { if (device) {
_autoconnect_retries_set(self, return _autoconnect_retries_set(self,
_devcon_lookup_data(self, device, sett_conn, TRUE, FALSE), _devcon_lookup_data(self, device, sett_conn, TRUE, FALSE),
retries_initial, retries_initial,
TRUE); TRUE);
return;
} }
c_list_for_each_entry (data, &sett_conn->devcon_con_lst_head, con_lst) c_list_for_each_entry (data, &sett_conn->devcon_con_lst_head, con_lst) {
_autoconnect_retries_set(self, data, retries_initial, TRUE); if (_autoconnect_retries_set(self, data, retries_initial, TRUE))
changed = TRUE;
}
return changed;
} }
/** /**

6
src/core/nm-manager.h
View File

@@ -243,9 +243,9 @@ void nm_manager_devcon_autoconnect_retries_set(NMManager *self,
NMSettingsConnection *sett_conn, NMSettingsConnection *sett_conn,
guint32 retries); guint32 retries);
void nm_manager_devcon_autoconnect_retries_reset(NMManager *self, gboolean nm_manager_devcon_autoconnect_retries_reset(NMManager *self,
NMDevice *device, NMDevice *device,
NMSettingsConnection *sett_conn); NMSettingsConnection *sett_conn);
gboolean nm_manager_devcon_autoconnect_reset_reconnect_all(NMManager *self, gboolean nm_manager_devcon_autoconnect_reset_reconnect_all(NMManager *self,
NMDevice *device, NMDevice *device,