mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-26 18:10:08 +01:00
2007-09-20 Dan Williams <dcbw@redhat.com>
* 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
This commit is contained in:
parent
8626b35c99
commit
a8b3aa46da
2 changed files with 10 additions and 4 deletions
|
|
@ -1,3 +1,12 @@
|
|||
2007-09-20 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* 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 <dcbw@redhat.com>
|
||||
|
||||
* libnm-glib/nm-access-point.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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue