From owner-p4-projects@FreeBSD.ORG  Sat Dec 25 19:33:11 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5FA2516A4D0; Sat, 25 Dec 2004 19:33:11 +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 3B38316A4CE
	for <perforce@freebsd.org>; Sat, 25 Dec 2004 19:33:11 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2567643D1F
	for <perforce@freebsd.org>; Sat, 25 Dec 2004 19:33:11 +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 iBPJXBHF056356
	for <perforce@freebsd.org>; Sat, 25 Dec 2004 19:33:11 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBPJXAbY056353
	for perforce@freebsd.org; Sat, 25 Dec 2004 19:33:10 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 25 Dec 2004 19:33:10 GMT
Message-Id: <200412251933.iBPJXAbY056353@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 67690 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: Sat, 25 Dec 2004 19:33:12 -0000

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

Change 67690 by sam@sam_ebb on 2004/12/25 19:32:12

	o accept turboG as well as g when doing erp station management
	o fix some pointer comparisons to check NULL instead of 0

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_node.c#28 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#28 (text+ko) ====

@@ -1024,7 +1024,7 @@
 	if (ni != NULL) {
 		/* XXX no rate negotiation; just dup */
 		ni->ni_rates = ic->ic_bss->ni_rates;
-		if (ic->ic_newassoc)
+		if (ic->ic_newassoc != NULL)
 			ic->ic_newassoc(ic, ni, 1);
 		/* XXX not right for 802.1x/WPA */
 		ieee80211_node_authorize(ic, ni);
@@ -1599,7 +1599,8 @@
 		IEEE80211_AID_SET(ni->ni_associd, ic->ic_aid_bitmap);
 		ic->ic_sta_assoc++;
 		newassoc = 1;
-		if (ic->ic_curmode == IEEE80211_MODE_11G)
+		if (ic->ic_curmode == IEEE80211_MODE_11G ||
+		    ic->ic_curmode == IEEE80211_MODE_TURBO_G)
 			ieee80211_node_join_11g(ic, ni);
 	} else
 		newassoc = 0;
@@ -1615,7 +1616,7 @@
 	);
 
 	/* give driver a chance to setup state like ni_txrate */
-	if (ic->ic_newassoc)
+	if (ic->ic_newassoc != NULL)
 		ic->ic_newassoc(ic, ni, newassoc);
 	ni->ni_inact_reload = ic->ic_inact_auth;
 	ni->ni_inact = ni->ni_inact_reload;
@@ -1633,7 +1634,8 @@
 ieee80211_node_leave_11g(struct ieee80211com *ic, struct ieee80211_node *ni)
 {
 
-	KASSERT(ic->ic_curmode == IEEE80211_MODE_11G,
+	KASSERT(ic->ic_curmode == IEEE80211_MODE_11G ||
+		ic->ic_curmode == IEEE80211_MODE_TURBO_G,
 		("not in 11g, curmode %x", ic->ic_curmode));
 
 	/*
@@ -1721,7 +1723,8 @@
 	ni->ni_associd = 0;
 	ic->ic_sta_assoc--;
 
-	if (ic->ic_curmode == IEEE80211_MODE_11G)
+	if (ic->ic_curmode == IEEE80211_MODE_11G ||
+	    ic->ic_curmode == IEEE80211_MODE_TURBO_G)
 		ieee80211_node_leave_11g(ic, ni);
 	/*
 	 * Cleanup station state.  In particular clear various