svn commit: r223996 - head/etc

[Adrian Chadd]

Author: adrian
Date: Thu Jul 14 05:19:28 2011
New Revision: 223996
URL: http://svn.freebsd.org/changeset/base/223996

Log:
  Japan regulatory domain update #1 - sync with CRDA entries.
  
  Specifics:
  
  * add 4920MHz-4980MHz for 11a and 11n/HT20
  * add 5040MHz-5080MHz for 11a and 11n/HT20
  * add 5500MHz-5700MHz for 11a and 11n/HT20 (DFS needed)
  * add 5500MHz-5680MHz for 11n/HT40 (DFS needed)
  
  TODO:
  
  * add correct HT40 bands for 4920-4980 and 5040-5080
  
  For the curious:
  
  There's been many revisions to the Japan regulatory rules.
  Apparently, the requirements require old cards certified on a previous
  version of the rules to obey the older rules, not the newer rules.
  
  The regdomain.xml outlines the -current- restrictions.
  
  The card driver (eg the ath_hal regulatory domain code) may include
  previous revisions of the Japan rules.
  
  The ath_hal regdomain code populates the initial channel list based on
  what the EEPROM indicates is possible. The regdomain.xml database imposes
  further restrictions on this.
  
  So regdomain.xml only needs to have the -current- rules. If the card
  was certified on an earlier set of JP rules, it may only support a subset
  of those channels - these are calculated at device attach and this
  restricted list is kicked to net80211. regdomain.xml operates on -this-
  list of channels.
  
  And thus, the correct regulatory behaviour for Japan is handled with only
  one regdomain.xml Japan database entry.
  
  (phew.)
  
  Obtained from:	Linux wireless-regdb

Modified:
  head/etc/regdomain.xml

Modified: head/etc/regdomain.xml
==============================================================================
--- head/etc/regdomain.xml	Thu Jul 14 04:21:27 2011	(r223995)
+++ head/etc/regdomain.xml	Thu Jul 14 05:19:28 2011	(r223996)
@@ -324,6 +324,14 @@
   </netband>
   <netband mode="11a">
     <band>
+      <freqband ref="F1_4920_4980"/>
+      <maxpower>23</maxpower>
+    </band>
+    <band>
+      <freqband ref="F1_5040_5080"/>
+      <maxpower>23</maxpower>
+    </band>
+    <band>
       <freqband ref="F1_5180_5240"/>
       <maxpower>23</maxpower>
     </band>
@@ -333,6 +341,12 @@
       <flags>IEEE80211_CHAN_PASSIVE</flags>
       <flags>IEEE80211_CHAN_DFS</flags>
     </band>
+    <band>
+      <freqband ref="F1_5500_5700"/>
+      <maxpower>23</maxpower>
+      <flags>IEEE80211_CHAN_PASSIVE</flags>
+      <flags>IEEE80211_CHAN_DFS</flags>
+    </band>
   </netband>
   <netband mode="11ng">
     <band>
@@ -350,6 +364,16 @@
   </netband>
   <netband mode="11na">
     <band>
+      <freqband ref="F1_4920_4980"/>
+      <maxpower>23</maxpower>
+      <flags>IEEE80211_CHAN_HT20</flags>
+    </band>
+    <band>
+      <freqband ref="F1_5040_5080"/>
+      <maxpower>23</maxpower>
+      <flags>IEEE80211_CHAN_HT20</flags>
+    </band>
+    <band>
       <freqband ref="F1_5180_5240"/>
       <maxpower>23</maxpower>
       <flags>IEEE80211_CHAN_HT20</flags>
@@ -373,6 +397,20 @@
       <flags>IEEE80211_CHAN_PASSIVE</flags>
       <flags>IEEE80211_CHAN_DFS</flags>
     </band>
+    <band>
+      <freqband ref="F1_5500_5700"/>
+      <maxpower>23</maxpower>
+      <flags>IEEE80211_CHAN_HT20</flags>
+      <flags>IEEE80211_CHAN_PASSIVE</flags>
+      <flags>IEEE80211_CHAN_DFS</flags>
+    </band>
+    <band>
+      <freqband ref="H4_5500_5680"/>
+      <maxpower>23</maxpower>
+      <flags>IEEE80211_CHAN_HT40</flags>
+      <flags>IEEE80211_CHAN_PASSIVE</flags>
+      <flags>IEEE80211_CHAN_DFS</flags>
+    </band>
   </netband>
 </rd>
 
@@ -1624,11 +1662,21 @@
   <flags>IEEE80211_CHAN_A</flags>
   <flags>IEEE80211_CHAN_HALF</flags>
 </freqband>
+<freqband id="F1_4920_4980">
+  <freqstart>4920</freqstart> <freqend>4980</freqend>
+  <chanwidth>20</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_A</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_5040_5080">
+  <freqstart>5040</freqstart> <freqend>5080</freqend>
+  <chanwidth>20</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>