From e536d40eaea5dcdc0743b0a5e8e17faa46608a50 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 19 Feb 2020 23:31:24 +0100 Subject: New upstream version 1.22.8 --- src/devices/wifi/nm-device-olpc-mesh.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/devices/wifi') diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c index c19ec766..516dc78b 100644 --- a/src/devices/wifi/nm-device-olpc-mesh.c +++ b/src/devices/wifi/nm-device-olpc-mesh.c @@ -405,7 +405,7 @@ state_changed (NMDevice *device, } static guint32 -get_dhcp_timeout (NMDevice *device, int addr_family) +get_dhcp_timeout_for_device (NMDevice *device, int addr_family) { /* shorter timeout for mesh connectivity */ return 20; @@ -521,7 +521,7 @@ nm_device_olpc_mesh_class_init (NMDeviceOlpcMeshClass *klass) device_class->act_stage1_prepare = act_stage1_prepare; device_class->act_stage2_config = act_stage2_config; device_class->state_changed = state_changed; - device_class->get_dhcp_timeout = get_dhcp_timeout; + device_class->get_dhcp_timeout_for_device = get_dhcp_timeout_for_device; obj_properties[PROP_COMPANION] = g_param_spec_string (NM_DEVICE_OLPC_MESH_COMPANION, "", "", -- cgit 1.3.0-6-gf8a5