PERFORCE change 83754 for review

[Sam Leffler]

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

Change 83754 by sam at 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;