diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-03-02 18:34:09 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-03-05 09:53:21 +0100 |
| commit | 99abcf0105286684f25525a468b7cb0670b621a5 (patch) | |
| tree | c61a1e15b963457682a17faca499265bcdb6beca /src/devices/wwan/nm-device-modem.c | |
| parent | ee63e008d152bec1c3c8a4895ce4ca719255cafa (diff) | |
| download | NetworkManager-99abcf0105286684f25525a468b7cb0670b621a5.tar.gz | |
device: merge IPv4 and IPv6 variant of nm_device_set_wwan_ip_config()
Diffstat (limited to 'src/devices/wwan/nm-device-modem.c')
| -rw-r--r-- | src/devices/wwan/nm-device-modem.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c index 0fd2fab81d..36fb2e8b5c 100644 --- a/src/devices/wwan/nm-device-modem.c +++ b/src/devices/wwan/nm-device-modem.c @@ -23,6 +23,7 @@ #include "nm-device-modem.h" #include "nm-modem.h" +#include "nm-ip4-config.h" #include "devices/nm-device-private.h" #include "nm-rfkill-manager.h" #include "settings/nm-settings-connection.h" @@ -211,7 +212,7 @@ modem_ip4_config_result (NMModem *modem, AF_INET, NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE); } else { - nm_device_set_wwan_ip4_config (device, config); + nm_device_set_wwan_ip_config (device, AF_INET, NM_IP_CONFIG_CAST (config)); nm_device_activate_schedule_ip_config_result (device, AF_INET, NULL); } } @@ -245,7 +246,7 @@ modem_ip6_config_result (NMModem *modem, nm_device_sysctl_ip_conf_set (device, AF_INET6, "disable_ipv6", "0"); if (config) - nm_device_set_wwan_ip6_config (device, config); + nm_device_set_wwan_ip_config (device, AF_INET6, NM_IP_CONFIG_CAST (config)); if (do_slaac == FALSE) { if (got_config) |