diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-07-22 16:20:36 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-07-23 12:53:55 -0500 |
| commit | 05e99e24a133409d454bacaa4d2cf22e02ea3c25 (patch) | |
| tree | 137819a4e303607fa89c2f8c147d06394ee07eaa | |
| parent | e2270040c0a25bee1549dda9054cca482b896819 (diff) | |
| download | NetworkManager-05e99e24a133409d454bacaa4d2cf22e02ea3c25.tar.gz | |
trivial: move addrconf6_start_with_link_ready() above caller
| -rw-r--r-- | src/devices/nm-device.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index f9b65929f6..5422c1115d 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -3636,6 +3636,29 @@ rdisc_config_changed (NMRDisc *rdisc, NMRDiscConfigMap changed, NMDevice *device nm_device_activate_schedule_ip6_config_result (device); } +static void +addrconf6_start_with_link_ready (NMDevice *self) +{ + NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); + NMUtilsIPv6IfaceId iid; + + g_assert (priv->rdisc); + + if (NM_DEVICE_GET_CLASS (self)->get_ip_iface_identifier (self, &iid)) + nm_rdisc_set_iid (priv->rdisc, iid); + else + nm_log_warn (LOGD_IP6, "(%s): failed to get interface identifier", nm_device_get_ip_iface (self)); + + nm_device_ipv6_sysctl_set (self, "accept_ra", "1"); + nm_device_ipv6_sysctl_set (self, "accept_ra_defrtr", "0"); + nm_device_ipv6_sysctl_set (self, "accept_ra_pinfo", "0"); + nm_device_ipv6_sysctl_set (self, "accept_ra_rtr_pref", "0"); + + priv->rdisc_config_changed_sigid = g_signal_connect (priv->rdisc, NM_RDISC_CONFIG_CHANGED, + G_CALLBACK (rdisc_config_changed), self); + nm_rdisc_start (priv->rdisc); +} + static gboolean addrconf6_start (NMDevice *self, NMSettingIP6ConfigPrivacy use_tempaddr) { @@ -3676,29 +3699,6 @@ addrconf6_start (NMDevice *self, NMSettingIP6ConfigPrivacy use_tempaddr) } static void -addrconf6_start_with_link_ready (NMDevice *self) -{ - NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); - NMUtilsIPv6IfaceId iid; - - g_assert (priv->rdisc); - - if (NM_DEVICE_GET_CLASS (self)->get_ip_iface_identifier (self, &iid)) - nm_rdisc_set_iid (priv->rdisc, iid); - else - nm_log_warn (LOGD_IP6, "(%s): failed to get interface identifier", nm_device_get_ip_iface (self)); - - nm_device_ipv6_sysctl_set (self, "accept_ra", "1"); - nm_device_ipv6_sysctl_set (self, "accept_ra_defrtr", "0"); - nm_device_ipv6_sysctl_set (self, "accept_ra_pinfo", "0"); - nm_device_ipv6_sysctl_set (self, "accept_ra_rtr_pref", "0"); - - priv->rdisc_config_changed_sigid = g_signal_connect (priv->rdisc, NM_RDISC_CONFIG_CHANGED, - G_CALLBACK (rdisc_config_changed), self); - nm_rdisc_start (priv->rdisc); -} - -static void addrconf6_cleanup (NMDevice *self) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); |