summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2006-01-31 04:13:37 +0000
committerDan Williams <dcbw@redhat.com>2006-01-31 04:13:37 +0000
commitb28dad15227582185d6a44ae0afbf4b7a230caae (patch)
treecd124f7df80624717989ebdf60f175566c07d720
parent8f39a2bceaaaf40691c14f6c6183752bd7aef476 (diff)
downloadNetworkManager-b28dad15227582185d6a44ae0afbf4b7a230caae.tar.gz
2006-01-30 Dan Williams <dcbw@redhat.com>
* src/nm-device-802-11-wireless.c - (supplicant_monitor_start): increase connect/auth timeout to 20 seconds from 10 seconds git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1412 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
-rw-r--r--ChangeLog6
-rw-r--r--src/nm-device-802-11-wireless.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3600e20b8e..641894084f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-01-30 Dan Williams <dcbw@redhat.com>
+ * src/nm-device-802-11-wireless.c
+ - (supplicant_monitor_start): increase connect/auth timeout to
+ 20 seconds from 10 seconds
+
+2006-01-30 Dan Williams <dcbw@redhat.com>
+
* src/Makefile.am
- Define LOCALSTATEDIR
diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c
index 585461d174..1e14a02a74 100644
--- a/src/nm-device-802-11-wireless.c
+++ b/src/nm-device-802-11-wireless.c
@@ -2539,8 +2539,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 10s */
- self->priv->sup_timeout = g_timeout_source_new (10000);
+ /* Set up a timeout on the association to kill it after 20s */
+ self->priv->sup_timeout = g_timeout_source_new (20000);
g_source_set_callback (self->priv->sup_timeout, supplicant_timeout_cb, self, NULL);
g_source_attach (self->priv->sup_timeout, context);