about summary refs log tree commit diff
path: root/src/devices/wwan
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2020-02-19 23:32:13 +0100
committerMichael Biebl <biebl@debian.org>2020-02-19 23:32:13 +0100
commit3c2c324f025086dfdd40e2ec9f6db0643625c1de (patch)
tree4efeae8faed34c747189f71b1129d67c3fe8bbf4 /src/devices/wwan
parentbc4ff7bc667094c9450d8a34abe552886c4b1f73 (diff)
parente536d40eaea5dcdc0743b0a5e8e17faa46608a50 (diff)
Update upstream source from tag 'upstream/1.22.8'
Update to upstream version '1.22.8'
with Debian dir 692c834c9a0433e17bbad56345902291f4c31d2a
Diffstat (limited to 'src/devices/wwan')
-rw-r--r--src/devices/wwan/nm-device-modem.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c
index 3e6ccc8f..3de5ae07 100644
--- a/src/devices/wwan/nm-device-modem.c
+++ b/src/devices/wwan/nm-device-modem.c
@@ -732,7 +732,7 @@ set_modem (NMDeviceModem *self, NMModem *modem)
 }
 
 static guint32
-get_dhcp_timeout (NMDevice *device, int addr_family)
+get_dhcp_timeout_for_device (NMDevice *device, int addr_family)
 {
 	/* DHCP is always done by the modem firmware, not by the network, and
 	 * by the time we get around to DHCP the firmware should already know
@@ -897,7 +897,7 @@ nm_device_modem_class_init (NMDeviceModemClass *klass)
 	device_class->is_available = is_available;
 	device_class->get_ip_iface_identifier = get_ip_iface_identifier;
 	device_class->get_configured_mtu = nm_modem_get_configured_mtu;
-	device_class->get_dhcp_timeout = get_dhcp_timeout;
+	device_class->get_dhcp_timeout_for_device = get_dhcp_timeout_for_device;
 
 	device_class->state_changed = device_state_changed;