svn commit: r187640 - user/sam/wifi/sys/net80211

[Sam Leffler]

Author: sam
Date: Fri Jan 23 18:42:45 2009
New Revision: 187640
URL: http://svn.freebsd.org/changeset/base/187640

Log:
  merge r187634 and r187635 from head

Modified:
  user/sam/wifi/sys/net80211/_ieee80211.h
  user/sam/wifi/sys/net80211/ieee80211_regdomain.c

Modified: user/sam/wifi/sys/net80211/_ieee80211.h
==============================================================================
--- user/sam/wifi/sys/net80211/_ieee80211.h	Fri Jan 23 18:40:31 2009	(r187639)
+++ user/sam/wifi/sys/net80211/_ieee80211.h	Fri Jan 23 18:42:45 2009	(r187640)
@@ -146,8 +146,11 @@ struct ieee80211_channel {
 #define	IEEE80211_CHAN_ANYC \
 	((struct ieee80211_channel *) IEEE80211_CHAN_ANY)
 
-/* bits 0-3 are for private use by drivers */
 /* channel attributes */
+#define	IEEE80211_CHAN_PRIV0	0x00000001 /* driver private bit 0 */
+#define	IEEE80211_CHAN_PRIV1	0x00000002 /* driver private bit 1 */
+#define	IEEE80211_CHAN_PRIV2	0x00000004 /* driver private bit 2 */
+#define	IEEE80211_CHAN_PRIV3	0x00000008 /* driver private bit 3 */
 #define	IEEE80211_CHAN_TURBO	0x00000010 /* Turbo channel */
 #define	IEEE80211_CHAN_CCK	0x00000020 /* CCK channel */
 #define	IEEE80211_CHAN_OFDM	0x00000040 /* OFDM channel */

Modified: user/sam/wifi/sys/net80211/ieee80211_regdomain.c
==============================================================================
--- user/sam/wifi/sys/net80211/ieee80211_regdomain.c	Fri Jan 23 18:40:31 2009	(r187639)
+++ user/sam/wifi/sys/net80211/ieee80211_regdomain.c	Fri Jan 23 18:42:45 2009	(r187640)
@@ -375,6 +375,13 @@ ieee80211_setregdomain(struct ieee80211v
 			c->ic_maxpower = 2*c->ic_maxregpower;
 	}
 	IEEE80211_LOCK(ic);
+	/* XXX bandaid; a running vap will likely crash */
+	if (!allvapsdown(ic)) {
+		IEEE80211_UNLOCK(ic);
+		IEEE80211_DPRINTF(vap, IEEE80211_MSG_IOCTL,
+		    "%s: reject: vaps are running\n", __func__);
+		return EBUSY;
+	}
 	error = ic->ic_setregdomain(ic, &reg->rd,
 	    reg->chaninfo.ic_nchans, reg->chaninfo.ic_chans);
 	if (error != 0) {
@@ -383,13 +390,6 @@ ieee80211_setregdomain(struct ieee80211v
 		    "%s: driver rejected request, error %u\n", __func__, error);
 		return error;
 	}
-	/* XXX bandaid; a running vap will likely crash */
-	if (!allvapsdown(ic)) {
-		IEEE80211_UNLOCK(ic);
-		IEEE80211_DPRINTF(vap, IEEE80211_MSG_IOCTL,
-		    "%s: reject: vaps are running\n", __func__);
-		return EBUSY;
-	}
 	/*
 	 * Commit: copy in new channel table and reset media state.
 	 * On return the state machines will be clocked so all vaps