PERFORCE change 66074 for review

[Sam Leffler]

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

Change 66074 by sam at sam_ebb on 2004/11/30 00:55:43

	o remove unused IEEE80211_PSCAN_WAIT
	o lengthen inactivity check interval to 15 seconds as we're
	  going to start doing more significant work and we don't
	  want to lock the station table so frequently (might want
	  to make this much longer)

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_node.h#12 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#12 (text+ko) ====

@@ -43,7 +43,7 @@
  * (waiting for a response to a management frame when operating
  * as a station), and node inactivity processing (when operating
  * as an AP).  For inactivity processing each node has a timeout
- * set in it's ni_intval field that is decremented on each timeout
+ * set in it's ni_inact field that is decremented on each timeout
  * and the node is reclaimed when the counter goes to zero.  We
  * use different inactivity timeout values depending on whether
  * the node is associated and authorized (either by 802.1x or
@@ -51,14 +51,14 @@
  * authorized.  The latter timeout is shorter to more aggressively
  * reclaim nodes that leave part way through the 802.1x exchange.
  */
-#define	IEEE80211_PSCAN_WAIT 	5		/* passive scan intvl (secs) */
-#define	IEEE80211_TRANS_WAIT 	5		/* transition interval (secs) */
-#define	IEEE80211_INACT_WAIT	5		/* inactivity interval (secs) */
+#define	IEEE80211_INACT_WAIT	15		/* inactivity interval (secs) */
 #define	IEEE80211_INACT_INIT	(30/IEEE80211_INACT_WAIT)	/* initial */
 #define	IEEE80211_INACT_AUTH	(180/IEEE80211_INACT_WAIT)	/* associated but not authorized */
 #define	IEEE80211_INACT_RUN	(300/IEEE80211_INACT_WAIT)	/* authorized */
 #define	IEEE80211_INACT_SCAN	(300/IEEE80211_INACT_WAIT)	/* scanned */
 
+#define	IEEE80211_TRANS_WAIT 	5		/* mgt frame tx timer (secs) */
+
 #define	IEEE80211_NODE_HASHSIZE	32
 /* simple hash is enough for variation of macaddr */
 #define	IEEE80211_NODE_HASH(addr)	\