From 442dc676ef94705aa1b21f08ac8e271bb17f09c6 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 19 Oct 2009 14:05:36 -0700 Subject: [PATCH] ip6: use device's IP interface, not its physical interface --- src/nm-device.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/nm-device.c b/src/nm-device.c index 0d3481cb3..1a7b8f8ae 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -532,7 +532,7 @@ ip6_addrconf_complete (NMIP6Manager *ip6_manager, NMDevice *self = NM_DEVICE (user_data); NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); - if (strcmp (nm_device_get_iface (self), iface) != 0) + if (strcmp (nm_device_get_ip_iface (self), iface) != 0) return; if (!nm_device_get_act_request (self)) return; @@ -553,7 +553,7 @@ ip6_config_changed (NMIP6Manager *ip6_manager, { NMDevice *self = NM_DEVICE (user_data); - if (strcmp (nm_device_get_iface (self), iface) != 0) + if (strcmp (nm_device_get_ip_iface (self), iface) != 0) return; if (!nm_device_get_act_request (self)) return; @@ -567,7 +567,7 @@ nm_device_setup_ip6 (NMDevice *self) NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); NMActRequest *req; NMConnection *connection; - const char *iface, *method = NULL; + const char *ip_iface, *method = NULL; NMSettingIP6Config *s_ip6; req = nm_device_get_act_request (self); @@ -598,8 +598,8 @@ nm_device_setup_ip6 (NMDevice *self) priv->ip6_waiting_for_config = FALSE; - iface = nm_device_get_iface (self); - nm_ip6_manager_prepare_interface (priv->ip6_manager, iface, s_ip6); + ip_iface = nm_device_get_ip_iface (self); + nm_ip6_manager_prepare_interface (priv->ip6_manager, ip_iface, s_ip6); } static void @@ -1139,7 +1139,7 @@ static NMActStageReturn real_act_stage3_ip6_config_start (NMDevice *self, NMDeviceStateReason *reason) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); - const char *iface = nm_device_get_iface (self); + const char *ip_iface = nm_device_get_ip_iface (self); g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE); @@ -1150,7 +1150,7 @@ real_act_stage3_ip6_config_start (NMDevice *self, NMDeviceStateReason *reason) return NM_ACT_STAGE_RETURN_SUCCESS; priv->ip6_waiting_for_config = TRUE; - nm_ip6_manager_begin_addrconf (priv->ip6_manager, iface); + nm_ip6_manager_begin_addrconf (priv->ip6_manager, ip_iface); return NM_ACT_STAGE_RETURN_POSTPONE; }