From owner-svn-src-projects@FreeBSD.ORG  Wed Jun 17 15:13:05 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 84A9F106566C;
	Wed, 17 Jun 2009 15:13:05 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 73EE28FC0C;
	Wed, 17 Jun 2009 15:13:05 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5HFD5Ta079494;
	Wed, 17 Jun 2009 15:13:05 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5HFD5Lm079492;
	Wed, 17 Jun 2009 15:13:05 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906171513.n5HFD5Lm079492@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Wed, 17 Jun 2009 15:13:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194369 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Jun 2009 15:13:05 -0000

Author: rpaulo
Date: Wed Jun 17 15:13:05 2009
New Revision: 194369
URL: http://svn.freebsd.org/changeset/base/194369

Log:
  Increase the timeouts temporarily to ease implementation.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Wed Jun 17 15:01:01 2009	(r194368)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Wed Jun 17 15:13:05 2009	(r194369)
@@ -82,11 +82,12 @@ static int	mesh_verify_meshconf(struct i
 		    struct ieee80211_meshconf_ie *);
 
 /* timeout values in miliseconds */
-static const int ieee80211_mesh_retrytimeout = 40;
+/* XXX: spec says 40 msec */
+static const int ieee80211_mesh_retrytimeout = 4000;
 #define	RETRY_TIMEOUT	msecs_to_ticks(ieee80211_mesh_retrytimeout)
-static const int ieee80211_mesh_holdingtimeout = 40;
+static const int ieee80211_mesh_holdingtimeout = 4000;
 #define	HOLDING_TIMEOUT	msecs_to_ticks(ieee80211_mesh_holdingtimeout)
-static const int ieee80211_mesh_confirmtimeout = 40;
+static const int ieee80211_mesh_confirmtimeout = 4000;
 #define	CONFIRM_TIMEOUT	msecs_to_ticks(ieee80211_mesh_confirmtimeout)
 static const int ieee80211_mesh_maxretries = 2;
 int		ieee80211_mesh_ttl = 31;