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

device: don't set NMDeviceModem's ip-iface right after constuction

Browse source 
nm_device_modem_new() is only called with a newly created
NMModemBroadband or NMModemOfono instance.
See the callers
  - NMModemManager:handle_new_modem()
    - NMWwanFactory:modem_added_cb()
      - NMDeviceModem:nm_device_modem_new()

Hence, at that point, the modem cannot yet have a data-port
or ip-iface set, because that is only obtained later.
This commit is contained in:
Thomas Haller 2018-01-12 10:09:52 +01:00
parent bfe38c1bf3
commit 0ef23b139d
1 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/devices/wwan/nm-device-modem.c
View file

@ -702,17 +702,15 @@ nm_device_modem_init (NMDeviceModem *self)
NMDevice *
nm_device_modem_new (NMModem *modem)
{
NMDevice *self;
NMDeviceModemCapabilities caps = NM_DEVICE_MODEM_CAPABILITY_NONE;
NMDeviceModemCapabilities current_caps = NM_DEVICE_MODEM_CAPABILITY_NONE;
const char *data_port;
g_return_val_if_fail (NM_IS_MODEM (modem), NULL);
/* Load capabilities */
nm_modem_get_capabilities (modem, &caps, &current_caps);
self = g_object_new (NM_TYPE_DEVICE_MODEM,
return g_object_new (NM_TYPE_DEVICE_MODEM,
NM_DEVICE_UDI, nm_modem_get_path (modem),
NM_DEVICE_IFACE, nm_modem_get_uid (modem),
NM_DEVICE_DRIVER, nm_modem_get_driver (modem),
@ -723,15 +721,6 @@ nm_device_modem_new (NMModem *modem)
NM_DEVICE_MODEM_CAPABILITIES, caps,
NM_DEVICE_MODEM_CURRENT_CAPABILITIES, current_caps,
NULL);
/* If the data port is known, set it as the IP interface immediately */
data_port = nm_modem_get_data_port (modem);
if (data_port) {
nm_device_set_ip_iface (self, data_port);
nm_device_ipv6_sysctl_set (self, "disable_ipv6", "1");
}
return self;
}
static void