NetworkManager r3239 - in branches/NETWORKMANAGER_0_6_0_RELEASE: . src

[dcbw svn gnome org]

Author: dcbw
Date: Wed Jan 16 21:21:05 2008
New Revision: 3239
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3239&view=rev

Log:
2008-01-16  Dan Williams  <dcbw redhat com>

	* src/nm-device-802-11-wireless.c
		- (real_act_stage4_ip_config_timeout): clean up the supplicant to ensure
			that the connection attempt starts fresh.  Otherwise, when the key
			comes back, NM pukes and fails the new attempt because the
			supplicant can't terminate and start up again quickly enough



Modified:
   branches/NETWORKMANAGER_0_6_0_RELEASE/ChangeLog
   branches/NETWORKMANAGER_0_6_0_RELEASE/src/nm-device-802-11-wireless.c

Modified: branches/NETWORKMANAGER_0_6_0_RELEASE/src/nm-device-802-11-wireless.c
==============================================================================
--- branches/NETWORKMANAGER_0_6_0_RELEASE/src/nm-device-802-11-wireless.c	(original)
+++ branches/NETWORKMANAGER_0_6_0_RELEASE/src/nm-device-802-11-wireless.c	Wed Jan 16 21:21:05 2008
@@ -2862,6 +2862,14 @@
 		/* Activation failed, we must have bad encryption key */
 		nm_debug ("Activation (%s/wireless): could not get IP configuration info for '%s', asking for new key.",
 				nm_device_get_iface (dev), nm_ap_get_essid (ap) ? nm_ap_get_essid (ap) : "(none)");
+
+		/* Kill the supplicant */
+		if (self->priv->supplicant) {
+			g_object_unref (self->priv->supplicant);
+			self->priv->supplicant = NULL;
+		}
+		remove_link_timeout (self);
+
 		nm_dbus_get_user_key_for_network (data->dbus_connection, req, TRUE);
 		ret = NM_ACT_STAGE_RETURN_POSTPONE;
 	}