From owner-p4-projects@FreeBSD.ORG  Sun Jan 27 19:06:31 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1BB9E16A421; Sun, 27 Jan 2008 19:06:31 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BD2AD16A419
	for <perforce@freebsd.org>; Sun, 27 Jan 2008 19:06:30 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id ADE8413C478
	for <perforce@freebsd.org>; Sun, 27 Jan 2008 19:06:30 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RJ6Uk9031344
	for <perforce@freebsd.org>; Sun, 27 Jan 2008 19:06:30 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RJ6UMh031341
	for perforce@freebsd.org; Sun, 27 Jan 2008 19:06:30 GMT
	(envelope-from sam@freebsd.org)
Date: Sun, 27 Jan 2008 19:06:30 GMT
Message-Id: <200801271906.m0RJ6UMh031341@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>
Cc: 
Subject: PERFORCE change 134224 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sun, 27 Jan 2008 19:06:31 -0000

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

Change 134224 by sam@sam_ebb on 2008/01/27 19:06:00

	don't cache iv_bss as it changes after calling ieee80211_create_ibss

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#5 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_hostap.c#5 (text+ko) ====

@@ -116,7 +116,6 @@
 hostap_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 {
 	struct ieee80211com *ic = vap->iv_ic;
-	struct ieee80211_node *ni;
 	enum ieee80211_state ostate;
 
 	IEEE80211_LOCK_ASSERT(ic);
@@ -128,7 +127,6 @@
 	vap->iv_state = nstate;			/* state transition */
 	if (ostate != IEEE80211_S_SCAN)
 		ieee80211_cancel_scan(vap);	/* background scan */
-	ni = vap->iv_bss;			/* NB: no reference held */
 	switch (nstate) {
 	case IEEE80211_S_INIT:
 		switch (ostate) {
@@ -248,10 +246,11 @@
 		case IEEE80211_S_CSA:
 #ifdef IEEE80211_DEBUG
 			if (ieee80211_msg_debug(vap)) {
+				struct ieee80211_node *ni = vap->iv_bss;
 				ieee80211_note(vap,
 				    "synchronized with %s ssid ",
 				    ether_sprintf(ni->ni_bssid));
-				ieee80211_print_essid(vap->iv_bss->ni_essid,
+				ieee80211_print_essid(ni->ni_essid,
 				    ni->ni_esslen);
 				/* XXX MCS/HT */
 				printf(" channel %d start %uMb\n",
@@ -273,7 +272,7 @@
 		} else if (vap->iv_auth->ia_detach != NULL) {
 			vap->iv_auth->ia_detach(vap);
 		}
-		ieee80211_node_authorize(ni);
+		ieee80211_node_authorize(vap->iv_bss);
 		break;
 	default:
 		break;