fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-03 23:00:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2006-01-30 Robert Love <rml@novell.com>

Browse source 
* src/nm-device-802-11-wireless.c: Make the wpa_supplicant a
	  preprocessor define (still 20s).  Fix message text in nm_info()
	  s/too too/took too/.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1414 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love 2006-01-31 15:54:00 +00:00 • committed by Robert Love
parent f812d5f4a7
commit 1dadd8600a
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-01-30 Robert Love <rml@novell.com>
* src/nm-device-802-11-wireless.c: Make the wpa_supplicant a
preprocessor define (still 20s). Fix message text in nm_info()
s/too too/took too/.
2006-01-30 Dan Williams <dcbw@redhat.com>
* src/nm-device-802-11-wireless.c

10
src/nm-device-802-11-wireless.c
View file

@ -43,6 +43,8 @@
#include "wpa_ctrl.h"
#include "cipher.h"
#define NM_SUPPLICANT_TIMEOUT 20 /* 20s: how long we wait for wpa_supplicant to associate */
/* #define IW_QUAL_DEBUG */
#define NM_DEVICE_802_11_WIRELESS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_802_11_WIRELESS, NMDevice80211WirelessPrivate))
@ -2347,8 +2349,8 @@ supplicant_timeout_cb (gpointer user_data)
g_assert (self);
nm_info ("Activation (%s/wireless): association too too long (>10s), failing activation.",
nm_device_get_iface (dev));
nm_info ("Activation (%s/wireless): association took too long (>%ss), failing activation.",
nm_device_get_iface (dev), NM_SUPPLICANT_TIMEOUT);
if (nm_device_is_activating (dev))
nm_policy_schedule_activation_failed (nm_device_get_act_request (dev));
@ -2539,8 +2541,8 @@ supplicant_monitor_start (NMDevice80211Wireless *self)
g_source_set_callback (self->priv->sup_status, (GSourceFunc) supplicant_status_cb, self, NULL);
g_source_attach (self->priv->sup_status, context);
/* Set up a timeout on the association to kill it after 20s */
self->priv->sup_timeout = g_timeout_source_new (20000);
/* Set up a timeout on the association to kill it after NM_SUPPLICANT_TIMEOUT seconds */
self->priv->sup_timeout = g_timeout_source_new (NM_SUPPLICANT_TIMEOUT * 1000);
g_source_set_callback (self->priv->sup_timeout, supplicant_timeout_cb, self, NULL);
g_source_attach (self->priv->sup_timeout, context);