PERFORCE change 70191 for review

[Sam Leffler]

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

Change 70191 by sam at sam_ebb on 2005/02/02 22:50:42

	need to track associated stations across all vap's so we
	can do the right thing for wme (and eventually dynamic turbo)

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_node.c#3 edit
.. //depot/projects/vap/sys/net80211/ieee80211_proto.c#4 edit
.. //depot/projects/vap/sys/net80211/ieee80211_var.h#5 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_node.c#3 (text+ko) ====

@@ -1648,6 +1648,7 @@
 		ni->ni_associd = aid | 0xc000;
 		IEEE80211_AID_SET(ni->ni_associd, vap->iv_aid_bitmap);
 		vap->iv_sta_assoc++;
+		ic->ic_sta_assoc++;
 		newassoc = 1;
 		if (ic->ic_curmode == IEEE80211_MODE_11G ||
 		    ic->ic_curmode == IEEE80211_MODE_TURBO_G)
@@ -1779,6 +1780,7 @@
 	IEEE80211_AID_CLR(ni->ni_associd, vap->iv_aid_bitmap);
 	ni->ni_associd = 0;
 	vap->iv_sta_assoc--;
+	ic->ic_sta_assoc--;
 
 	if (ic->ic_curmode == IEEE80211_MODE_11G ||
 	    ic->ic_curmode == IEEE80211_MODE_TURBO_G)

==== //depot/projects/vap/sys/net80211/ieee80211_proto.c#4 (text+ko) ====

@@ -797,8 +797,8 @@
 	}
 	
 	/* XXX multi-bss */
-	if (vap->iv_opmode == IEEE80211_M_HOSTAP &&
-	    vap->iv_sta_assoc < 2 && (wme->wme_flags & WME_F_AGGRMODE) == 0) {
+	if (ic->ic_opmode == IEEE80211_M_HOSTAP &&
+	    ic->ic_sta_assoc < 2 && (wme->wme_flags & WME_F_AGGRMODE) == 0) {
         	static const u_int8_t logCwMin[IEEE80211_MODE_MAX] = {
               		3,	/* IEEE80211_MODE_AUTO */
               		3,	/* IEEE80211_MODE_11A */

==== //depot/projects/vap/sys/net80211/ieee80211_var.h#5 (text+ko) ====

@@ -135,6 +135,7 @@
 	enum ieee80211_protmode	ic_protmode;	/* 802.11g protection mode */
 	u_int16_t		ic_nonerpsta;	/* # non-ERP stations */
 	u_int16_t		ic_longslotsta;	/* # long slot time stations */
+	u_int16_t		ic_sta_assoc;	/* stations associated */
 
 	/* virtual ap create/delete */
 	struct ieee80211vap 	*(*ic_vap_create)(struct ieee80211com *,