NetworkManager r3411 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Mon Mar 10 19:33:36 2008
New Revision: 3411
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3411&view=rev

Log:
2008-03-10  Dan Williams  <dcbw redhat com>

	* src/nm-device.c
		- (nm_device_bring_down): deactivate the device if it's activating too,
			not just if it's already activated.  This makes sure that everything
			from an association attempt is cleaned up (like DHCP for example)



Modified:
   trunk/ChangeLog
   trunk/src/nm-device.c

Modified: trunk/src/nm-device.c
==============================================================================
--- trunk/src/nm-device.c	(original)
+++ trunk/src/nm-device.c	Mon Mar 10 19:33:36 2008
@@ -1515,6 +1515,8 @@
 void
 nm_device_bring_down (NMDevice *self, gboolean wait)
 {
+	NMDeviceState state;
+
 	g_return_if_fail (NM_IS_DEVICE (self));
 
 	if (!nm_device_is_up (self))
@@ -1522,7 +1524,8 @@
 
 	nm_info ("Bringing down device %s", nm_device_get_iface (self));
 
-	if (nm_device_get_state (self) == NM_DEVICE_STATE_ACTIVATED)
+	state = nm_device_get_state (self);
+	if ((state == NM_DEVICE_STATE_ACTIVATED) || nm_device_is_activating (self))
 		nm_device_interface_deactivate (NM_DEVICE_INTERFACE (self));
 
 	if (NM_DEVICE_GET_CLASS (self)->bring_down)