From eff1a1bc13fc0e86674247dc323001c4220cc554 Mon Sep 17 00:00:00 2001
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 14 Jul 2011 05:49:35 +0000
Subject: [PATCH] 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.
---
 etc/regdomain.xml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/etc/regdomain.xml b/etc/regdomain.xml
index f47b91781403..ff5711392c45 100644
--- a/etc/regdomain.xml
+++ b/etc/regdomain.xml
@@ -368,11 +368,21 @@
       <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>
@@ -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>