svn commit: r223998 - head/etc

[Adrian Chadd]

Author: adrian
Date: Thu Jul 14 05:49:35 2011
New Revision: 223998
URL: http://svn.freebsd.org/changeset/base/223998

Log:
  More Japan regulatory domain fixes:
  
  * Add HT40 entries for the two new Japan bands
  * Fix a channel separation bug in one of the new bands I introduced
    in a previous commit.

Modified:
  head/etc/regdomain.xml

Modified: head/etc/regdomain.xml
==============================================================================
--- head/etc/regdomain.xml	Thu Jul 14 05:28:33 2011	(r223997)
+++ head/etc/regdomain.xml	Thu Jul 14 05:49:35 2011	(r223998)
@@ -369,11 +369,21 @@
       <flags>IEEE80211_CHAN_HT20</flags>
     </band>
     <band>
+      <freqband ref="H4_4920_4980"/>
+      <maxpower>23</maxpower>
+      <flags>IEEE80211_CHAN_HT40</flags>
+    </band>
+    <band>
       <freqband ref="F1_5040_5080"/>
       <maxpower>23</maxpower>
       <flags>IEEE80211_CHAN_HT20</flags>
     </band>
     <band>
+      <freqband ref="H4_5040_5080"/>
+      <maxpower>23</maxpower>
+      <flags>IEEE80211_CHAN_HT40</flags>
+    </band>
+    <band>
       <freqband ref="F1_5180_5240"/>
       <maxpower>23</maxpower>
       <flags>IEEE80211_CHAN_HT20</flags>
@@ -1664,7 +1674,12 @@
 </freqband>
 <freqband id="F1_4920_4980">
   <freqstart>4920</freqstart> <freqend>4980</freqend>
-  <chanwidth>20</chanwidth> <chansep>5</chansep>
+  <chanwidth>20</chanwidth> <chansep>20</chansep>
+  <flags>IEEE80211_CHAN_A</flags>
+</freqband>
+<freqband id="H4_4920_4980">
+  <freqstart>4920</freqstart> <freqend>4980</freqend>
+  <chanwidth>40</chanwidth> <chansep>20</chansep>
   <flags>IEEE80211_CHAN_A</flags>
 </freqband>
 <freqband id="F1_4950_4980">
@@ -1677,6 +1692,11 @@
   <chanwidth>20</chanwidth> <chansep>20</chansep>
   <flags>IEEE80211_CHAN_A</flags>
 </freqband>
+<freqband id="H4_5040_5080">
+  <freqstart>5040</freqstart> <freqend>5080</freqend>
+  <chanwidth>40</chanwidth> <chansep>20</chansep>
+  <flags>IEEE80211_CHAN_A</flags>
+</freqband>
 <freqband id="F1_5120_5240">
   <freqstart>5120</freqstart> <freqend>5240</freqend>
   <chanwidth>20</chanwidth> <chansep>20</chansep>