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
This commit is contained in:
Dan Williams 2005-11-09 01:59:23 +00:00
parent 6f68d85cd4
commit 67913703fc
2 changed files with 10 additions and 2 deletions

View file

@ -1,9 +1,17 @@
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
2005-11-08 Dan Williams <dcbw@redhat.com>
Patch from Bill Moss <bmoss@clemson.edu>
* 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

View file

@ -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);