2005-10-02 Dan Williams <dcbw@redhat.com>

* Shorten time taken to sleep by fastpathing bits of device deactivation
		necessary for sleep.

	* Fix issue where deactivating a device might deactivate the active
		VPN connection, even if the VPN was not using the device.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@985 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2005-10-02 05:02:49 +00:00
parent 92bb1e6414
commit 23b0619e4f
10 changed files with 69 additions and 27 deletions

View File

@@ -326,7 +326,8 @@ void nm_dhcp_manager_cancel_transaction (NMDHCPManager *manager, NMActRequest *r
/* FIXME: we should really monitor the interface's DHCP state by waiting
* for dhcdbd to tell us the device is "down" rather than sleeping here.
*/
sleep (1);
if (!manager->data->asleep)
sleep (1);
}
g_free (path);