From owner-svn-src-user@FreeBSD.ORG Fri Jan 23 18:42:46 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 22480106566B; Fri, 23 Jan 2009 18:42:46 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EA9FA8FC14; Fri, 23 Jan 2009 18:42:45 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0NIgjoQ050320; Fri, 23 Jan 2009 18:42:45 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0NIgjdS050318; Fri, 23 Jan 2009 18:42:45 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901231842.n0NIgjdS050318@svn.freebsd.org> From: Sam Leffler Date: Fri, 23 Jan 2009 18:42:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187640 - user/sam/wifi/sys/net80211 X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jan 2009 18:42:46 -0000 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, ®->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