From owner-svn-src-projects@FreeBSD.ORG Fri Jan 16 20:51:04 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 77E72106566B; Fri, 16 Jan 2009 20:51:04 +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 5B2B28FC08; Fri, 16 Jan 2009 20:51:04 +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 n0GKp4uv018335; Fri, 16 Jan 2009 20:51:04 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0GKp4Zf018332; Fri, 16 Jan 2009 20:51:04 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901162051.n0GKp4Zf018332@svn.freebsd.org> From: Sam Leffler Date: Fri, 16 Jan 2009 20:51:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187346 - in projects/vap7: etc sbin/ifconfig sys sys/contrib/pf sys/dev sys/dev/ath sys/dev/ath/ath_hal sys/dev/ath/ath_hal/ar5210 sys/dev/ath/ath_hal/ar5211 sys/dev/ath/ath_hal/ar5212... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jan 2009 20:51:04 -0000 Author: sam Date: Fri Jan 16 20:51:03 2009 New Revision: 187346 URL: http://svn.freebsd.org/changeset/base/187346 Log: merge bits necessary to get the Public Safety Band Modified: projects/vap7/etc/ (props changed) projects/vap7/etc/regdomain.xml projects/vap7/sbin/ifconfig/ (props changed) projects/vap7/sbin/ifconfig/ifieee80211.c projects/vap7/sys/ (props changed) projects/vap7/sys/contrib/pf/ (props changed) projects/vap7/sys/dev/ (props changed) projects/vap7/sys/dev/ath/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ah_regdomain.c projects/vap7/sys/dev/ath/ath_hal/ar5210/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5211/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5212/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5312/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5416/ (props changed) projects/vap7/sys/dev/cxgb/ (props changed) projects/vap7/sys/dev/usb2/ (props changed) projects/vap7/sys/i386/conf/USB2 (props changed) projects/vap7/sys/modules/usb2/ (props changed) projects/vap7/sys/net80211/ (props changed) Modified: projects/vap7/etc/regdomain.xml ============================================================================== --- projects/vap7/etc/regdomain.xml Fri Jan 16 20:44:45 2009 (r187345) +++ projects/vap7/etc/regdomain.xml Fri Jan 16 20:51:03 2009 (r187346) @@ -190,6 +190,55 @@ + + + + FCC4 + 0x12 + + + + 30 + IEEE80211_CHAN_B + + + + + + 30 + IEEE80211_CHAN_G + + + + + + 23 + + + + 27 + + + + 30 + + + + + + 30 + IEEE80211_CHAN_G + IEEE80211_CHAN_HT20 + + + + 30 + IEEE80211_CHAN_G + IEEE80211_CHAN_HT40 + + + + JAPAN 0x40 @@ -1515,6 +1564,23 @@ NB: keep sorted by starting frequency, legacy before HT --> + + 4942 4987 + 5 5 + IEEE80211_CHAN_A + IEEE80211_CHAN_QUARTER + + + 4945 4985 + 10 5 + IEEE80211_CHAN_A + IEEE80211_CHAN_HALF + + + 4950 4980 + 20 5 + IEEE80211_CHAN_A + 5120 5240 20 20 Modified: projects/vap7/sbin/ifconfig/ifieee80211.c ============================================================================== --- projects/vap7/sbin/ifconfig/ifieee80211.c Fri Jan 16 20:44:45 2009 (r187345) +++ projects/vap7/sbin/ifconfig/ifieee80211.c Fri Jan 16 20:51:03 2009 (r187346) @@ -1806,7 +1806,7 @@ regdomain_addchans(struct ieee80211req_c continue; } if ((flags & IEEE80211_CHAN_QUARTER) && - ((chanFlags & IEEE80211_CHAN_HALF) == 0 && + ((chanFlags & IEEE80211_CHAN_QUARTER) == 0 && (flags & IEEE80211_CHAN_GSM) == 0)) { if (verbose) printf("%u: skip, device does not support quarter-rate channels\n", freq); @@ -1900,12 +1900,26 @@ regdomain_makechannels( if (!LIST_EMPTY(&rd->bands_11b)) regdomain_addchans(ci, &rd->bands_11b, reg, IEEE80211_CHAN_B, &dc->dc_chaninfo); - if (!LIST_EMPTY(&rd->bands_11g)) + if (!LIST_EMPTY(&rd->bands_11g)) { regdomain_addchans(ci, &rd->bands_11g, reg, IEEE80211_CHAN_G, &dc->dc_chaninfo); - if (!LIST_EMPTY(&rd->bands_11a)) + regdomain_addchans(ci, &rd->bands_11g, reg, + IEEE80211_CHAN_G | IEEE80211_CHAN_HALF, + &dc->dc_chaninfo); + regdomain_addchans(ci, &rd->bands_11g, reg, + IEEE80211_CHAN_G | IEEE80211_CHAN_QUARTER, + &dc->dc_chaninfo); + } + if (!LIST_EMPTY(&rd->bands_11a)) { regdomain_addchans(ci, &rd->bands_11a, reg, IEEE80211_CHAN_A, &dc->dc_chaninfo); + regdomain_addchans(ci, &rd->bands_11a, reg, + IEEE80211_CHAN_A | IEEE80211_CHAN_HALF, + &dc->dc_chaninfo); + regdomain_addchans(ci, &rd->bands_11a, reg, + IEEE80211_CHAN_A | IEEE80211_CHAN_QUARTER, + &dc->dc_chaninfo); + } if (!LIST_EMPTY(&rd->bands_11na)) { regdomain_addchans(ci, &rd->bands_11na, reg, IEEE80211_CHAN_A | IEEE80211_CHAN_HT20, Modified: projects/vap7/sys/dev/ath/ath_hal/ah_regdomain.c ============================================================================== --- projects/vap7/sys/dev/ath/ath_hal/ah_regdomain.c Fri Jan 16 20:44:45 2009 (r187345) +++ projects/vap7/sys/dev/ath/ath_hal/ah_regdomain.c Fri Jan 16 20:51:03 2009 (r187346) @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ah_regdomain.c,v 1.24 2008/11/27 22:29:27 sam Exp $ + * $FreeBSD$ */ #include "opt_ah.h" @@ -1231,9 +1231,18 @@ static REG_DOMAIN regDomains[] = { {.regDmnEnum = DEBUG_REG_DMN, .conformanceTestLimit = FCC, .dfsMask = DFS_FCC3, - .chan11a = BM3(F1_5120_5240, F1_5260_5700, F1_5745_5825), - .chan11a_half = BM3(F2_5120_5240, F2_5260_5700, F7_5745_5825), - .chan11a_quarter = BM3(F3_5120_5240, F3_5260_5700, F8_5745_5825), + .chan11a = BM4(F1_4950_4980, + F1_5120_5240, + F1_5260_5700, + F1_5745_5825), + .chan11a_half = BM4(F1_4945_4985, + F2_5120_5240, + F2_5260_5700, + F7_5745_5825), + .chan11a_quarter = BM4(F1_4942_4987, + F3_5120_5240, + F3_5260_5700, + F8_5745_5825), .chan11a_turbo = BM8(T1_5130_5210, T1_5250_5330, T1_5370_5490,