From owner-svn-src-all@FreeBSD.ORG  Thu Jul 14 05:49:36 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 52DDA1065670;
	Thu, 14 Jul 2011 05:49:36 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2AED18FC12;
	Thu, 14 Jul 2011 05:49:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6E5naIn015731;
	Thu, 14 Jul 2011 05:49:36 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6E5naEZ015729;
	Thu, 14 Jul 2011 05:49:36 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201107140549.p6E5naEZ015729@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 14 Jul 2011 05:49:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223998 - head/etc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Jul 2011 05:49:36 -0000

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>