--- elwix/config/etc/default/regdomain.xml	2011/07/05 23:43:00	1.1.1.1
+++ elwix/config/etc/default/regdomain.xml	2013/07/22 21:57:29	1.3.4.1
@@ -22,7 +22,7 @@
   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-  $FreeBSD: src/etc/regdomain.xml,v 1.5 2010/05/14 04:53:57 dougb Exp $
+  $FreeBSD: src/etc/regdomain.xml,v 1.16 2012/12/07 06:37:06 svnexp Exp $
 -->
 
 <regulatory-data>
@@ -83,7 +83,7 @@
       <flags>IEEE80211_CHAN_HT20</flags>
     </band>
     <band>
-      <freqband ref="F1_2412_2462"/>
+      <freqband ref="H4_2412_2462"/>
       <maxpower>30</maxpower>
       <flags>IEEE80211_CHAN_G</flags>
       <flags>IEEE80211_CHAN_HT40</flags>
@@ -96,7 +96,7 @@
       <flags>IEEE80211_CHAN_HT20</flags>
     </band>
     <band>
-      <freqband ref="F1_5180_5240"/>
+      <freqband ref="H4_5180_5240"/>
       <maxpower>17</maxpower>
       <flags>IEEE80211_CHAN_HT40</flags>
     </band>
@@ -106,7 +106,7 @@
       <flags>IEEE80211_CHAN_HT20</flags>
     </band>
     <band>
-      <freqband ref="F1_5745_5805"/>
+      <freqband ref="H4_5745_5805"/>
       <maxpower>23</maxpower>
       <flags>IEEE80211_CHAN_HT40</flags>
     </band>
@@ -138,6 +138,24 @@
       <maxpower>17</maxpower>
     </band>
     <band>
+      <freqband ref="F1_5260_5320"/>
+      <maxpower>23</maxpower>
+      <flags>IEEE80211_CHAN_PASSIVE</flags>
+      <flags>IEEE80211_CHAN_DFS</flags>
+    </band>
+    <band>
+      <freqband ref="F1_5500_5580"/>
+      <maxpower>23</maxpower>
+      <flags>IEEE80211_CHAN_PASSIVE</flags>
+      <flags>IEEE80211_CHAN_DFS</flags>
+    </band>
+    <band>
+      <freqband ref="F1_5660_5700"/>
+      <maxpower>23</maxpower>
+      <flags>IEEE80211_CHAN_PASSIVE</flags>
+      <flags>IEEE80211_CHAN_DFS</flags>
+    </band>
+    <band>
       <freqband ref="F1_5745_5805"/>
       <maxpower>23</maxpower>
       <flags>IEEE80211_CHAN_PASSIVE</flags>
@@ -176,6 +194,48 @@
       <flags>IEEE80211_CHAN_HT40</flags>
     </band>
     <band>
+      <freqband ref="F1_5260_5320"/>
+      <maxpower>23</maxpower>
+      <flags>IEEE80211_CHAN_HT20</flags>
+      <flags>IEEE80211_CHAN_PASSIVE</flags>
+      <flags>IEEE80211_CHAN_DFS</flags>
+    </band>
+    <band>
+      <freqband ref="H4_5260_5320"/>
+      <maxpower>23</maxpower>
+      <flags>IEEE80211_CHAN_HT40</flags>
+      <flags>IEEE80211_CHAN_PASSIVE</flags>
+      <flags>IEEE80211_CHAN_DFS</flags>
+    </band>
+    <band>
+      <freqband ref="F1_5500_5580"/>
+      <maxpower>23</maxpower>
+      <flags>IEEE80211_CHAN_HT20</flags>
+      <flags>IEEE80211_CHAN_PASSIVE</flags>
+      <flags>IEEE80211_CHAN_DFS</flags>
+    </band>
+    <band>
+      <freqband ref="H4_5500_5580"/>
+      <maxpower>23</maxpower>
+      <flags>IEEE80211_CHAN_HT40</flags>
+      <flags>IEEE80211_CHAN_PASSIVE</flags>
+      <flags>IEEE80211_CHAN_DFS</flags>
+    </band>
+    <band>
+      <freqband ref="F1_5660_5700"/>
+      <maxpower>23</maxpower>
+      <flags>IEEE80211_CHAN_HT20</flags>
+      <flags>IEEE80211_CHAN_PASSIVE</flags>
+      <flags>IEEE80211_CHAN_DFS</flags>
+    </band>
+    <band>
+      <freqband ref="H4_5660_5700"/>
+      <maxpower>23</maxpower>
+      <flags>IEEE80211_CHAN_HT40</flags>
+      <flags>IEEE80211_CHAN_PASSIVE</flags>
+      <flags>IEEE80211_CHAN_DFS</flags>
+    </band>
+    <band>
       <freqband ref="F1_5745_5805"/>
       <maxpower>23</maxpower>
       <flags>IEEE80211_CHAN_HT20</flags>
@@ -231,7 +291,7 @@
       <flags>IEEE80211_CHAN_HT20</flags>
     </band>
     <band>
-      <freqband ref="F1_2412_2462"/>
+      <freqband ref="H4_2412_2462"/>
       <maxpower>30</maxpower>
       <flags>IEEE80211_CHAN_G</flags>
       <flags>IEEE80211_CHAN_HT40</flags>
@@ -264,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>
@@ -273,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>
@@ -290,6 +364,26 @@
   </netband>
   <netband mode="11na">
     <band>
+      <freqband ref="F1_4920_4980"/>
+      <maxpower>23</maxpower>
+      <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>
@@ -313,6 +407,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>
 
@@ -321,9 +429,9 @@
   <sku>0x30</sku>
   <netband mode="11b">
     <band>
-	<freqband ref="F1_2412_2472"/>
-	<maxpower>30</maxpower>
-	<flags>IEEE80211_CHAN_B</flags>
+      <freqband ref="F1_2412_2472"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_B</flags>
     </band>
   </netband>
   <netband mode="11g">
@@ -1195,6 +1303,29 @@
     </band>
   </netband>
 </rd>
+
+<rd id="xc900m">
+  <name>XC900M</name>
+  <sku>0x29b</sku>
+  <netband mode="11g">
+    <band>
+      <freqband ref="S1_905_925_5"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S1_910_920_10"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S1_915_915"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+  </netband>
+</rd>
+
 </regulatory-domains>
 
 <country-codes>
@@ -1564,11 +1695,31 @@
   <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>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">
   <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="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>
@@ -1624,6 +1775,16 @@
   <chanwidth>40</chanwidth> <chansep>20</chansep>
   <flags>IEEE80211_CHAN_A</flags>
 </freqband>
+<freqband id="F1_5500_5580">
+  <freqstart>5500</freqstart> <freqend>5580</freqend>
+  <chanwidth>20</chanwidth> <chansep>20</chansep>
+  <flags>IEEE80211_CHAN_A</flags>
+</freqband>
+<freqband id="H4_5500_5580">
+  <freqstart>5500</freqstart> <freqend>5580</freqend>
+  <chanwidth>40</chanwidth> <chansep>20</chansep>
+  <flags>IEEE80211_CHAN_A</flags>
+</freqband>
 <freqband id="F1_5500_5620">
   <freqstart>5500</freqstart> <freqend>5620</freqend>
   <chanwidth>20</chanwidth> <chansep>20</chansep>
@@ -1644,6 +1805,16 @@
   <chanwidth>20</chanwidth> <chansep>20</chansep>
   <flags>IEEE80211_CHAN_A</flags>
 </freqband>
+<freqband id="F1_5660_5700">
+  <freqstart>5660</freqstart> <freqend>5700</freqend>
+  <chanwidth>20</chanwidth> <chansep>20</chansep>
+  <flags>IEEE80211_CHAN_A</flags>
+</freqband>
+<freqband id="H4_5660_5700">
+  <freqstart>5660</freqstart> <freqend>5700</freqend>
+  <chanwidth>40</chanwidth> <chansep>20</chansep>
+  <flags>IEEE80211_CHAN_A</flags>
+</freqband>
 <freqband id="H4_5725_5825">
   <freqstart>5725</freqstart> <freqend>5825</freqend>
   <chanwidth>40</chanwidth> <chansep>20</chansep>
@@ -1747,6 +1918,25 @@
   <chanwidth>20</chanwidth> <chansep>5</chansep>
   <flags>IEEE80211_CHAN_GSM</flags>
 </freqband>
+
+<freqband id="S1_905_925_5">
+  <freqstart>905</freqstart> <freqend>925</freqend>
+  <chanwidth>5</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_QUARTER</flags>
+</freqband>
+<freqband id="S1_910_920_10">
+  <freqstart>910</freqstart> <freqend>920</freqend>
+  <chanwidth>10</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_HALF</flags>
+</freqband>
+<freqband id="S1_915_915">
+  <freqstart>915</freqstart> <freqend>915</freqend>
+  <chanwidth>20</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+</freqband>
+
 
 </shared-frequency-bands>