From owner-p4-projects@FreeBSD.ORG  Thu Apr 10 23:22:16 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C51111065670; Thu, 10 Apr 2008 23:22:15 +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 87879106564A
	for <perforce@freebsd.org>; Thu, 10 Apr 2008 23:22:15 +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 7AF688FC1C
	for <perforce@freebsd.org>; Thu, 10 Apr 2008 23:22:15 +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 m3ANMFvj052505
	for <perforce@freebsd.org>; Thu, 10 Apr 2008 23:22:15 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3ANMFcE052503
	for perforce@freebsd.org; Thu, 10 Apr 2008 23:22:15 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 10 Apr 2008 23:22:15 GMT
Message-Id: <200804102322.m3ANMFcE052503@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 139766 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: Thu, 10 Apr 2008 23:22:16 -0000

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

Change 139766 by sam@sam_ebb on 2008/04/10 23:22:11

	catch up w/ ioctl changes; can't reference ni_chan except in RUN state

Affected files ...

.. //depot/projects/vap/sys/dev/mwl/if_mwl.c#5 edit

Differences ...

==== //depot/projects/vap/sys/dev/mwl/if_mwl.c#5 (text+ko) ====

@@ -1078,6 +1078,8 @@
 	enum ieee80211_phymode mode;
 	MWL_HAL_TXRATE rates;
 
+	KASSERT(vap->iv_state == IEEE80211_S_RUN, ("state %d", vap->iv_state));
+
 	mode = ieee80211_chan2mode(ni->ni_chan);
 	/*
 	 * Use legacy rates when operating a mixed HT+non-HT bss.
@@ -1116,6 +1118,8 @@
 	enum ieee80211_phymode mode;
 	uint8_t rate;
 
+	KASSERT(vap->iv_state == IEEE80211_S_RUN, ("state %d", vap->iv_state));
+
 	mode = ieee80211_chan2mode(ni->ni_chan);
 	/*
 	 * Use legacy rates when operating a mixed HT+non-HT bss.
@@ -1298,7 +1302,8 @@
 	struct mwl_hal_vap *hvap = MWL_VAP(vap)->mv_hvap;
 	struct ieee80211com *ic = vap->iv_ic;
 
-	mwl_setrates(vap);
+	if (state == IEEE80211_S_RUN)
+		mwl_setrates(vap);
 	/* XXX off by 1? */
 	mwl_hal_setrtsthreshold(hvap, vap->iv_rtsthreshold);
 	/* XXX auto? 20/40 split? */