fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-06 02:18:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

l3cfg: fix typo in variable name

Browse source 
Replace "mesc" with "msec".

Fixes: 1feaf427d2 ('platform: rework handling of failed routes during nm_platform_ip_route_sync()')
This commit is contained in:
Beniamino Galvani 2023-07-19 17:14:50 +02:00
parent 8da4d088ba
commit 3fb1c4dc23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/nm-l3cfg.c
View file

@ -4074,7 +4074,7 @@ _failedobj_handle_routes(NML3Cfg *self, int addr_family, GPtrArray *routes_faile
gboolean just_failed = FALSE; gboolean just_failed = FALSE;
gboolean arm_timer = FALSE; gboolean arm_timer = FALSE;
int grace_timeout_msec; int grace_timeout_msec;
gint64 grace_expiry_mesc; gint64 grace_expiry_msec;
nm_assert(NMP_OBJECT_GET_TYPE(o) == NMP_OBJECT_TYPE_IP_ROUTE(NM_IS_IPv4(addr_family))); nm_assert(NMP_OBJECT_GET_TYPE(o) == NMP_OBJECT_TYPE_IP_ROUTE(NM_IS_IPv4(addr_family)));
@ -4106,11 +4106,11 @@ _failedobj_handle_routes(NML3Cfg *self, int addr_family, GPtrArray *routes_faile
grace_timeout_msec = 0; grace_timeout_msec = 0;
} }
grace_expiry_mesc = now_msec + grace_timeout_msec; grace_expiry_msec = now_msec + grace_timeout_msec;
if (obj_state->os_failedobj_expiry_msec == 0) { if (obj_state->os_failedobj_expiry_msec == 0) {
/* This is a new failure that we didn't see before... */ /* This is a new failure that we didn't see before... */
obj_state->os_failedobj_expiry_msec = grace_expiry_mesc; obj_state->os_failedobj_expiry_msec = grace_expiry_msec;
if (grace_timeout_msec == 0) if (grace_timeout_msec == 0)
just_failed = TRUE; just_failed = TRUE;
else { else {
@ -4118,9 +4118,9 @@ _failedobj_handle_routes(NML3Cfg *self, int addr_family, GPtrArray *routes_faile
just_started_to_fail = TRUE; just_started_to_fail = TRUE;
} }
} else { } else {
if (obj_state->os_failedobj_expiry_msec > grace_expiry_mesc) { if (obj_state->os_failedobj_expiry_msec > grace_expiry_msec) {
/* Shorten the grace timeout. We anyway rearm below... */ /* Shorten the grace timeout. We anyway rearm below... */
obj_state->os_failedobj_expiry_msec = grace_expiry_mesc; obj_state->os_failedobj_expiry_msec = grace_expiry_msec;
} }
if (obj_state->os_failedobj_expiry_msec <= now_msec) { if (obj_state->os_failedobj_expiry_msec <= now_msec) {
/* The grace period is (already) expired. */ /* The grace period is (already) expired. */