From owner-svn-src-head@FreeBSD.ORG  Mon Aug 27 23:18:42 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 428C3106566B;
	Mon, 27 Aug 2012 23:18:42 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2D0C38FC16;
	Mon, 27 Aug 2012 23:18:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7RNIgce073174;
	Mon, 27 Aug 2012 23:18:42 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7RNIfcO073172;
	Mon, 27 Aug 2012 23:18:41 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201208272318.q7RNIfcO073172@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 27 Aug 2012 23:18:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239760 - head/sys/dev/wtap
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2012 23:18:42 -0000

Author: adrian
Date: Mon Aug 27 23:18:41 2012
New Revision: 239760
URL: http://svn.freebsd.org/changeset/base/239760

Log:
  Don't grab an unreferenced pointer to the VAP bss node.

Modified:
  head/sys/dev/wtap/if_wtap.c

Modified: head/sys/dev/wtap/if_wtap.c
==============================================================================
--- head/sys/dev/wtap/if_wtap.c	Mon Aug 27 21:59:52 2012	(r239759)
+++ head/sys/dev/wtap/if_wtap.c	Mon Aug 27 23:18:41 2012	(r239760)
@@ -268,7 +268,7 @@ wtap_newstate(struct ieee80211vap *vap, 
 
 	DWTAP_PRINTF("%s\n", __func__);
 
-	ni = vap->iv_bss;
+	ni = ieee80211_ref_node(vap->iv_bss);
 	/*
 	 * Invoke the parent method to do net80211 work.
 	 */
@@ -278,7 +278,8 @@ wtap_newstate(struct ieee80211vap *vap, 
 
 	if (nstate == IEEE80211_S_RUN) {
 		/* NB: collect bss node again, it may have changed */
-		ni = vap->iv_bss;
+		ieee80211_free_node(ni);
+		ni = ieee80211_ref_node(vap->iv_bss);
 		switch (vap->iv_opmode) {
 		case IEEE80211_M_MBSS:
 			error = wtap_beacon_alloc(sc, ni);
@@ -294,9 +295,11 @@ wtap_newstate(struct ieee80211vap *vap, 
 	} else if (nstate == IEEE80211_S_INIT) {
 		callout_stop(&avp->av_swba);
 	}
+	ieee80211_free_node(ni);
 	return 0;
 bad:
 	printf("%s: bad\n", __func__);
+	ieee80211_free_node(ni);
 	return error;
 }
 
@@ -319,6 +322,7 @@ wtap_vap_create(struct ieee80211com *ic,
 	 struct ieee80211vap *vap;
 	 struct wtap_vap *avp;
 	 int error;
+	struct ieee80211_node *ni;
 
 	 DWTAP_PRINTF("%s\n", __func__);
 
@@ -347,7 +351,9 @@ wtap_vap_create(struct ieee80211com *ic,
 	    (const char *)ic->ic_ifp->if_xname);
 
 	/* TODO this is a hack to force it to choose the rate we want */
-	vap->iv_bss->ni_txrate = 130;
+	ni = ieee80211_ref_node(vap->iv_bss);
+	ni->ni_txrate = 130;
+	ieee80211_free_node(ni);
 	return vap;
 }