summaryrefslogtreecommitdiff
path: root/src/NetworkManagerDevice.c
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2005-11-09 01:59:23 +0000
committerDan Williams <dcbw@redhat.com>2005-11-09 01:59:23 +0000
commit67913703fca4b0a47e4bca88c22bd0daf776ace5 (patch)
treeedfa9d4ca0b6ea5a03b865dcc9ebb5fb7bb2265f /src/NetworkManagerDevice.c
parent6f68d85cd4c2047921794548d17bad83dba41979 (diff)
downloadNetworkManager-67913703fca4b0a47e4bca88c22bd0daf776ace5.tar.gz
2005-11-08 Dan Williams <dcbw@redhat.com>
Patch from Bill Moss <bmoss@clemson.edu> * src/NetworkManagerDevice.c - (nm_device_activate_stage5_ip_config_commit): fix ordering of nm_policy_schedule_activation_finish() to prevent a race condition that causes the link to be dropped git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1102 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'src/NetworkManagerDevice.c')
-rw-r--r--src/NetworkManagerDevice.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c
index aa44df3635..f8c1ace0cd 100644
--- a/src/NetworkManagerDevice.c
+++ b/src/NetworkManagerDevice.c
@@ -3154,8 +3154,8 @@ static gboolean nm_device_activate_stage5_ip_config_commit (NMActRequest *req)
nm_device_update_ip4_address (dev);
nm_system_device_add_ip6_link_address (dev);
nm_system_restart_mdns_responder ();
- nm_policy_schedule_activation_finish (req);
nm_device_set_link_active (dev, nm_device_probe_link_state (dev));
+ nm_policy_schedule_activation_finish (req);
}
else
nm_policy_schedule_activation_failed (req);