PERFORCE change 138663 for review

[Sam Leffler]

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

Change 138663 by sam at 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