svn commit: r187635 - head/sys/net80211

[Sam Leffler]

Author: sam
Date: Fri Jan 23 18:16:14 2009
New Revision: 187635
URL: http://svn.freebsd.org/changeset/base/187635

Log:
  fix regulatory state check for all vaps' being down; it must be done
  before calling the ic_setregdomain callback

Modified:
  head/sys/net80211/ieee80211_regdomain.c

Modified: head/sys/net80211/ieee80211_regdomain.c
==============================================================================
--- head/sys/net80211/ieee80211_regdomain.c	Fri Jan 23 18:15:09 2009	(r187634)
+++ head/sys/net80211/ieee80211_regdomain.c	Fri Jan 23 18:16:14 2009	(r187635)
@@ -373,6 +373,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) {
@@ -381,13 +388,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