From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 21:04:59 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 01B5C1065682; Wed, 26 Mar 2008 21:04:59 +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 B385C1065673
	for <perforce@freebsd.org>; Wed, 26 Mar 2008 21:04:58 +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 9969D8FC2B
	for <perforce@freebsd.org>; Wed, 26 Mar 2008 21:04:58 +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 m2QL4w2a094792
	for <perforce@freebsd.org>; Wed, 26 Mar 2008 21:04:58 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QL4wWd094790
	for perforce@freebsd.org; Wed, 26 Mar 2008 21:04:58 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 26 Mar 2008 21:04:58 GMT
Message-Id: <200803262104.m2QL4wWd094790@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 138663 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: Wed, 26 Mar 2008 21:05:00 -0000

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

Change 138663 by sam@sam_ebb on 2008/03/26 21:04:18

	handle channel change on monitor mode vaps more carefully; we
	cannot call back into the driver unless it's marked RUNNING

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#46 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#46 (text+ko) ====

@@ -1812,9 +1812,12 @@
 		/*
 		 * Monitor mode can switch directly.
 		 */
-		ieee80211_setcurchan(ic, vap->iv_des_chan);
-		vap->iv_bss->ni_chan = ic->ic_curchan;
-		/* XXX kick other vap's to follow */
+		if (IFNET_IS_UP_RUNNING(vap->iv_ifp)) {
+			/* XXX need state machine for other vap's to follow */
+			ieee80211_setcurchan(ic, vap->iv_des_chan);
+			vap->iv_bss->ni_chan = ic->ic_curchan;
+		} else
+			ic->ic_curchan = vap->iv_des_chan;
 	} else {
 		/*
 		 * Need to go through the state machine in case we