diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-11-07 09:52:55 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-11-07 11:23:34 -0600 |
| commit | a9bf2e1a311cf58035eeb93500d6908799c67adf (patch) | |
| tree | 81656892edf2a7df6cf559e251afd4ae0417015b | |
| parent | a7ffd1563b7dfcc5a7f72bdc2683892c06d3d990 (diff) | |
| download | NetworkManager-dcbw/blahblah.tar.gz | |
fixup! iface-helper: add nm-iface-helper for dynamic configure-then-quit supportdcbw/blahblah
Fixup for NMSettingIPConfig changes.
| -rw-r--r-- | src/devices/nm-device.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 46ff9ea1de..3390bf765e 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -7032,8 +7032,6 @@ nm_device_spawn_iface_helper (NMDevice *self) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); gboolean priority_set = FALSE, configured = FALSE; - NMSettingIP4Config *s_ip4; - NMSettingIP6Config *s_ip6; NMConnection *connection; GError *error = NULL; const char *method; @@ -7065,6 +7063,7 @@ nm_device_spawn_iface_helper (NMDevice *self) && g_strcmp0 (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO) == 0 && priv->dhcp4_client && dhcp4_address) { + NMSettingIPConfig *s_ip4; GBytes *client_id; char *hex_client_id; const char *hostname; @@ -7078,7 +7077,7 @@ nm_device_spawn_iface_helper (NMDevice *self) g_ptr_array_add (argv, g_strdup ("--dhcp4")); g_ptr_array_add (argv, g_strdup (dhcp4_address)); - if (nm_setting_ip4_config_get_may_fail (s_ip4) == FALSE) + if (nm_setting_ip_config_get_may_fail (s_ip4) == FALSE) g_ptr_array_add (argv, g_strdup ("--dhcp4-required")); client_id = nm_dhcp_client_get_client_id (priv->dhcp4_client); @@ -7104,6 +7103,7 @@ nm_device_spawn_iface_helper (NMDevice *self) && g_strcmp0 (method, NM_SETTING_IP6_CONFIG_METHOD_AUTO) == 0 && priv->rdisc && priv->ac_ip6_config) { + NMSettingIPConfig *s_ip6; char *hex_iid; NMUtilsIPv6IfaceId iid = NM_UTILS_IPV6_IFACE_ID_INIT; @@ -7112,7 +7112,7 @@ nm_device_spawn_iface_helper (NMDevice *self) g_ptr_array_add (argv, g_strdup ("--slaac")); - if (nm_setting_ip6_config_get_may_fail (s_ip6) == FALSE) + if (nm_setting_ip_config_get_may_fail (s_ip6) == FALSE) g_ptr_array_add (argv, g_strdup ("--slaac-required")); g_ptr_array_add (argv, g_strdup ("--slaac-tempaddr")); |