From owner-svn-src-all@FreeBSD.ORG  Sun Jun 26 10:32:10 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 DA60D1065670;
	Sun, 26 Jun 2011 10:32:09 +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 C04688FC0C;
	Sun, 26 Jun 2011 10:32:09 +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 p5QAW9Y8049365;
	Sun, 26 Jun 2011 10:32:09 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5QAW9uB049362;
	Sun, 26 Jun 2011 10:32:09 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201106261032.p5QAW9uB049362@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 26 Jun 2011 10:32:09 +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: r223563 - in head/etc: . mtree
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: Sun, 26 Jun 2011 10:32:10 -0000

Author: adrian
Date: Sun Jun 26 10:32:09 2011
New Revision: 223563
URL: http://svn.freebsd.org/changeset/base/223563

Log:
  Add a couple more frequency ranges to the FCC3 (FCC + DFS) regulatory domain.
  
  The frequency range 5490MHz -> 5710MHz was opened up sometime in 2009, but
  regdomain.xml wasn't updated.
  
  FCC reference: (Section 15.407): http://louise.hallikainen.org/FCC/FccRules/2009/15/407/
  
  The hole between 5600-5650MHz is due to a request from Airports using
  a weather radar system which also utilises this range.
  The GIT commit explaining this hole in more detail can be found here:
  
  http://git.kernel.org/?p=linux/kernel/git/linville/wireless-regdb.git;a=commit;h=fcbf9225d56e82d9a4e506187d42285e76d81523

Modified:
  head/etc/mtree/BSD.include.dist
  head/etc/regdomain.xml

Modified: head/etc/mtree/BSD.include.dist
==============================================================================
--- head/etc/mtree/BSD.include.dist	Sun Jun 26 10:07:48 2011	(r223562)
+++ head/etc/mtree/BSD.include.dist	Sun Jun 26 10:32:09 2011	(r223563)
@@ -229,6 +229,8 @@
     ..
     kadm5
     ..
+    lib80211
+    ..
     libmilter
     ..
     lwres

Modified: head/etc/regdomain.xml
==============================================================================
--- head/etc/regdomain.xml	Sun Jun 26 10:07:48 2011	(r223562)
+++ head/etc/regdomain.xml	Sun Jun 26 10:32:09 2011	(r223563)
@@ -144,6 +144,18 @@
       <flags>IEEE80211_CHAN_DFS</flags>
     </band>
     <band>
+      <freqband ref="F1_5500_5580"/>
+      <maxpower>20</maxpower>
+      <flags>IEEE80211_CHAN_PASSIVE</flags>
+      <flags>IEEE80211_CHAN_DFS</flags>
+    </band>
+    <band>
+      <freqband ref="F1_5660_5700"/>
+      <maxpower>20</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>
@@ -196,6 +208,34 @@
       <flags>IEEE80211_CHAN_DFS</flags>
     </band>
     <band>
+      <freqband ref="F1_5500_5580"/>
+      <maxpower>20</maxpower>
+      <flags>IEEE80211_CHAN_HT20</flags>
+      <flags>IEEE80211_CHAN_PASSIVE</flags>
+      <flags>IEEE80211_CHAN_DFS</flags>
+    </band>
+    <band>
+      <freqband ref="H4_5500_5580"/>
+      <maxpower>20</maxpower>
+      <flags>IEEE80211_CHAN_HT40</flags>
+      <flags>IEEE80211_CHAN_PASSIVE</flags>
+      <flags>IEEE80211_CHAN_DFS</flags>
+    </band>
+    <band>
+      <freqband ref="F1_5660_5700"/>
+      <maxpower>20</maxpower>
+      <flags>IEEE80211_CHAN_HT20</flags>
+      <flags>IEEE80211_CHAN_PASSIVE</flags>
+      <flags>IEEE80211_CHAN_DFS</flags>
+    </band>
+    <band>
+      <freqband ref="H4_5660_5700"/>
+      <maxpower>20</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>
@@ -1644,6 +1684,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>
@@ -1664,6 +1714,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>