From 02106df3be75ff0f94ac1cc4222259b99e008fc5 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Tue, 8 Feb 2022 13:58:32 +0100 Subject: [PATCH] device: fix required-timeout evaluation Once the required-timeout expires, we should evaluate whether the *other* address family is ready. Fixes: 58287cbcc0c8 ('core: rework IP configuration in NetworkManager using layer 3 configuration') Fixes-test: @dracut_NM_NFS_root_nfs_ip_dhcp_dhcp6_slow_ip6 https://bugzilla.redhat.com/show_bug.cgi?id=2051904 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1090 --- 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 6dda543193..bdfb70a5ae 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -2943,7 +2943,7 @@ _dev_ip_state_req_timeout_cb_x(NMDevice *self, int addr_family) _LOGD_ip(addr_family, "required-timeout: expired"); nm_clear_g_source_inst(&priv->ip_data_x[NM_IS_IPv4(addr_family)].req_timeout_source); - _dev_ip_state_check(self, addr_family); + _dev_ip_state_check(self, nm_utils_addr_family_other(addr_family)); return G_SOURCE_CONTINUE; }