From owner-p4-projects@FreeBSD.ORG  Fri Sep 16 20:41:55 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0128D16A421; Fri, 16 Sep 2005 20:41:54 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CCFA116A41F
	for <perforce@freebsd.org>; Fri, 16 Sep 2005 20:41:54 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9A75643D46
	for <perforce@freebsd.org>; Fri, 16 Sep 2005 20:41:54 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j8GKfsLJ020696
	for <perforce@freebsd.org>; Fri, 16 Sep 2005 20:41:54 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8GKfsDc020693
	for perforce@freebsd.org; Fri, 16 Sep 2005 20:41:54 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 16 Sep 2005 20:41:54 GMT
Message-Id: <200509162041.j8GKfsDc020693@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 83754 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Sep 2005 20:41:56 -0000

http://perforce.freebsd.org/chv.cgi?CH=83754

Change 83754 by sam@sam_ebb on 2005/09/16 20:41:00

	default valid scan cache age to the bgscan interval; when roaming
	is enabled and it's less than the bgscan intvl it effectively
	overrides the bgscan intvl

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_scan.c#4 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_scan.c#4 (text+ko) ====

@@ -80,13 +80,12 @@
  * driver (dBm).  Transmit rate thresholds are IEEE rate codes (i.e
  * .5M units).
  */
-#define	SCAN_VALID_DEFAULT		60	/* scan cache valid age (secs) */
 #define	ROAM_RSSI_11A_DEFAULT		24	/* rssi threshold for 11a bss */
 #define	ROAM_RSSI_11B_DEFAULT		24	/* rssi threshold for 11b bss */
 #define	ROAM_RSSI_11BONLY_DEFAULT	24	/* rssi threshold for 11b-only bss */
-#define	ROAM_RATE_11A_DEFAULT		2*24	/* tx rate threshold for 11a bss */
-#define	ROAM_RATE_11B_DEFAULT		2*9	/* tx rate threshold for 11b bss */
-#define	ROAM_RATE_11BONLY_DEFAULT	2*5	/* tx rate threshold for 11b-only bss */
+#define	ROAM_RATE_11A_DEFAULT		2*24	/* tx rate thresh for 11a bss */
+#define	ROAM_RATE_11B_DEFAULT		2*9	/* tx rate thresh for 11b bss */
+#define	ROAM_RATE_11BONLY_DEFAULT	2*5	/* tx rate thresh for 11b-only bss */
 
 static	void scan_restart_pwrsav(void *);
 static	void scan_next(void *);
@@ -111,7 +110,7 @@
 
 	ic->ic_bgscanidle = (IEEE80211_BGSCAN_IDLE_DEFAULT*1000)/hz;
 	ic->ic_bgscanintvl = IEEE80211_BGSCAN_INTVAL_DEFAULT*hz;
-	ic->ic_scanvalid = SCAN_VALID_DEFAULT*hz;
+	ic->ic_scanvalid = ic->ic_bgscanintvl;
 	ic->ic_roam.rssi11a = ROAM_RSSI_11A_DEFAULT;
 	ic->ic_roam.rssi11b = ROAM_RSSI_11B_DEFAULT;
 	ic->ic_roam.rssi11bOnly = ROAM_RSSI_11BONLY_DEFAULT;