From 67913703fca4b0a47e4bca88c22bd0daf776ace5 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 9 Nov 2005 01:59:23 +0000 Subject: [PATCH] 2005-11-08 Dan Williams Patch from Bill Moss * 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 --- ChangeLog | 10 +++++++++- src/NetworkManagerDevice.c | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00206b7fb5..02cdbba4d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,17 @@ +2005-11-08 Dan Williams + + Patch from Bill Moss + * 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 + 2005-11-08 Dan Williams Patch from Bill Moss * src/NetworkManagerAPList.c src/NetworkManagerDevice.c - src/NetworkManagerDBus.c + src/NetworkManagerDbus.c - Replace occurances of ether_ntoa_r() with iw_ether_ntop() so we get more readable ether/mac addresses 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);