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...
Sam Leffler
sam at FreeBSD.org
Fri Jan 16 12:51:04 PST 2009
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 @@
</netband>
</rd>
+<!-- FCC4 is FCC w/ Public Safety Band (PSB) -->
+
+<rd id="fcc4">
+ <name>FCC4</name>
+ <sku>0x12</sku>
+ <netband mode="11b">
+ <band>
+ <freqband ref="F1_2412_2462"/>
+ <maxpower>30</maxpower>
+ <flags>IEEE80211_CHAN_B</flags>
+ </band>
+ </netband>
+ <netband mode="11g">
+ <band>
+ <freqband ref="F1_2412_2462"/>
+ <maxpower>30</maxpower>
+ <flags>IEEE80211_CHAN_G</flags>
+ </band>
+ </netband>
+ <netband mode="11a">
+ <band>
+ <freqband ref="F1_4950_4980"/>
+ <maxpower>23</maxpower>
+ </band>
+ <band>
+ <freqband ref="F1_4945_4985_10"/>
+ <maxpower>27</maxpower>
+ </band>
+ <band>
+ <freqband ref="F1_4942_4987_5"/>
+ <maxpower>30</maxpower>
+ </band>
+ </netband>
+ <netband mode="11ng">
+ <band>
+ <freqband ref="F1_2412_2462"/>
+ <maxpower>30</maxpower>
+ <flags>IEEE80211_CHAN_G</flags>
+ <flags>IEEE80211_CHAN_HT20</flags>
+ </band>
+ <band>
+ <freqband ref="F1_2412_2462"/>
+ <maxpower>30</maxpower>
+ <flags>IEEE80211_CHAN_G</flags>
+ <flags>IEEE80211_CHAN_HT40</flags>
+ </band>
+ </netband>
+</rd>
+
<rd id="japan">
<name>JAPAN</name>
<sku>0x40</sku>
@@ -1515,6 +1564,23 @@
NB: keep sorted by starting frequency, legacy before HT
-->
<shared-frequency-bands>
+<freqband id="F1_4942_4987_5">
+ <freqstart>4942</freqstart> <freqend>4987</freqend>
+ <chanwidth>5</chanwidth> <chansep>5</chansep>
+ <flags>IEEE80211_CHAN_A</flags>
+ <flags>IEEE80211_CHAN_QUARTER</flags>
+</freqband>
+<freqband id="F1_4945_4985_10">
+ <freqstart>4945</freqstart> <freqend>4985</freqend>
+ <chanwidth>10</chanwidth> <chansep>5</chansep>
+ <flags>IEEE80211_CHAN_A</flags>
+ <flags>IEEE80211_CHAN_HALF</flags>
+</freqband>
+<freqband id="F1_4950_4980">
+ <freqstart>4950</freqstart> <freqend>4980</freqend>
+ <chanwidth>20</chanwidth> <chansep>5</chansep>
+ <flags>IEEE80211_CHAN_A</flags>
+</freqband>
<freqband id="F1_5120_5240">
<freqstart>5120</freqstart> <freqend>5240</freqend>
<chanwidth>20</chanwidth> <chansep>20</chansep>
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,
More information about the svn-src-projects
mailing list