From 7b46cab8eba5f2cb74a2b047f218d32fd36dfea6 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 28 Sep 2015 19:20:13 +0200 Subject: [PATCH] device: allow overriding the DHCPv4 timeout https://bugzilla.redhat.com/show_bug.cgi?id=1262922 --- src/devices/nm-device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 961d725a8d..d48d7e3afe 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -3798,7 +3798,7 @@ dhcp4_start (NMDevice *self, nm_setting_ip_config_get_dhcp_send_hostname (s_ip4), nm_setting_ip_config_get_dhcp_hostname (s_ip4), nm_setting_ip4_config_get_dhcp_client_id (NM_SETTING_IP4_CONFIG (s_ip4)), - priv->dhcp_timeout, + nm_setting_ip4_config_get_dhcp_timeout (NM_SETTING_IP4_CONFIG (s_ip4)) ?: priv->dhcp_timeout, priv->dhcp_anycast_address, NULL);