From owner-p4-projects@FreeBSD.ORG  Wed Feb  2 22:51:23 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 660F716A502; Wed,  2 Feb 2005 22:51:22 +0000 (GMT)
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 A803C16A55F
	for <perforce@freebsd.org>; Wed,  2 Feb 2005 22:51:21 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7956043D31
	for <perforce@freebsd.org>; Wed,  2 Feb 2005 22:51:21 +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 j12MpLBZ077721
	for <perforce@freebsd.org>; Wed, 2 Feb 2005 22:51:21 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j12MpLCM077718
	for perforce@freebsd.org; Wed, 2 Feb 2005 22:51:21 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 2 Feb 2005 22:51:21 GMT
Message-Id: <200502022251.j12MpLCM077718@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>
Subject: PERFORCE change 70191 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Wed, 02 Feb 2005 22:51:23 -0000

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

Change 70191 by sam@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 *,