From 4fd510cbcd8eeb98981d7ae6046f2459a3c9e8ee Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 6 Dec 2011 16:36:37 -0600 Subject: [PATCH] trivial: move some log messages earlier Would have been helpful to more easily catch a bug cyphermox and I were discussion on IRC. --- src/nm-device.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/nm-device.c b/src/nm-device.c index 5326c7cdd5..7bef59074f 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -2561,6 +2561,10 @@ nm_device_activate_ip4_config_commit (gpointer user_data) /* Clear the activation source ID now that this stage has run */ activation_source_clear (self, FALSE, 0); + iface = nm_device_get_iface (self); + nm_log_info (LOGD_DEVICE, "Activation (%s) Stage 5 of 5 (IPv4 Commit) started...", + iface); + req = nm_device_get_act_request (self); g_assert (req); connection = nm_act_request_get_connection (req); @@ -2569,10 +2573,6 @@ nm_device_activate_ip4_config_commit (gpointer user_data) config = g_object_get_data (G_OBJECT (req), PENDING_IP4_CONFIG); g_assert (config); - iface = nm_device_get_iface (self); - nm_log_info (LOGD_DEVICE, "Activation (%s) Stage 5 of 5 (IPv4 Commit) started...", - iface); - /* Make sure the interface is up again just because */ ifindex = nm_device_get_ip_ifindex (self); if ((ifindex > 0) && (nm_system_iface_is_up (ifindex) == FALSE)) @@ -2720,6 +2720,10 @@ nm_device_activate_ip6_config_commit (gpointer user_data) /* Clear the activation source ID now that this stage has run */ activation_source_clear (self, FALSE, 0); + iface = nm_device_get_iface (self); + nm_log_info (LOGD_DEVICE, "Activation (%s) Stage 5 of 5 (IPv6 Commit) started...", + iface); + req = nm_device_get_act_request (self); g_assert (req); connection = nm_act_request_get_connection (req); @@ -2728,10 +2732,6 @@ nm_device_activate_ip6_config_commit (gpointer user_data) config = g_object_get_data (G_OBJECT (req), PENDING_IP6_CONFIG); g_assert (config); - iface = nm_device_get_iface (self); - nm_log_info (LOGD_DEVICE, "Activation (%s) Stage 5 of 5 (IPv6 Commit) started...", - iface); - /* Make sure the interface is up again just because */ ifindex = nm_device_get_ip_ifindex (self); if ((ifindex > 0) && (nm_system_iface_is_up (ifindex) == FALSE))