From a8b3aa46dae3cbe41d44d807c4703445c72d552b Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 21 Sep 2007 03:14:38 +0000 Subject: [PATCH] 2007-09-20 Dan Williams * src/nm-device-802-11-wireless.c - (supplicant_iface_connection_state_cb_handler): don't use the card's composite link state when determining when to start the disconnection timer; that link state is already based on the supplicant interface's status which is exactly what's already being examined, plus the link state is a conglomeration of various things that we don't want here git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2838 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 9 +++++++++ src/nm-device-802-11-wireless.c | 5 +---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index feb1138968..068a67b947 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-09-20 Dan Williams + + * src/nm-device-802-11-wireless.c + - (supplicant_iface_connection_state_cb_handler): don't use the card's + composite link state when determining when to start the disconnection + timer; that link state is already based on the supplicant interface's + status which is exactly what's already being examined, plus the link + state is a conglomeration of various things that we don't want here + 2007-09-20 Dan Williams * libnm-glib/nm-access-point.c diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c index 507cb982d8..4c3c103c7c 100644 --- a/src/nm-device-802-11-wireless.c +++ b/src/nm-device-802-11-wireless.c @@ -2050,12 +2050,9 @@ supplicant_iface_connection_state_cb_handler (gpointer user_data) } } else if (new_state == NM_SUPPLICANT_INTERFACE_CON_STATE_DISCONNECTED) { if (nm_device_get_state (dev) == NM_DEVICE_STATE_ACTIVATED || nm_device_is_activating (dev)) { - gboolean has_link = nm_device_has_active_link (NM_DEVICE (self)); - /* Start the link timeout so we allow some time for reauthentication */ - if (!has_link && (self->priv->link_timeout_id == 0) && !self->priv->scanning) { + if ((self->priv->link_timeout_id == 0) && !self->priv->scanning) self->priv->link_timeout_id = g_timeout_add (12000, link_timeout_cb, self); - } } else { nm_device_set_active_link (dev, FALSE); }