From owner-svn-src-head@FreeBSD.ORG  Wed Jul 20 05:59:28 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F2EE91065676;
	Wed, 20 Jul 2011 05:59:28 +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 E361F8FC15;
	Wed, 20 Jul 2011 05:59:28 +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 p6K5xSK3003483;
	Wed, 20 Jul 2011 05:59:28 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6K5xSSx003481;
	Wed, 20 Jul 2011 05:59:28 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201107200559.p6K5xSSx003481@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 20 Jul 2011 05:59:28 +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: r224224 - head/sbin/ifconfig
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Jul 2011 05:59:29 -0000

Author: adrian
Date: Wed Jul 20 05:59:28 2011
New Revision: 224224
URL: http://svn.freebsd.org/changeset/base/224224

Log:
  This patch removes a check in ifconfig which disables HT/40 channels
  on frequency bands with DFS. All Atheros chipsets >= AR9001 support
  radar event detection on HT40 extension channels.
  
  This should be a chipset specific item rather than enforced in the
  regulatory domain database.
  
  In addition, it's irrelevant for STA mode, as the radar detection is
  done by the access point, not the STA.
  
  Approved by:	re (kib)

Modified:
  head/sbin/ifconfig/ifieee80211.c

Modified: head/sbin/ifconfig/ifieee80211.c
==============================================================================
--- head/sbin/ifconfig/ifieee80211.c	Wed Jul 20 04:57:40 2011	(r224223)
+++ head/sbin/ifconfig/ifieee80211.c	Wed Jul 20 05:59:28 2011	(r224224)
@@ -2027,18 +2027,6 @@ regdomain_addchans(struct ieee80211req_c
 						    "HT40 channel\n", freq);
 					continue;
 				}
-				/*
-				 * DFS and HT40 don't mix.  This should be
-				 * expressed in the regdomain database but
-				 * just in case enforce it here.
-				 */
-				if ((chanFlags & IEEE80211_CHAN_HT40) &&
-				    (flags & IEEE80211_CHAN_DFS)) {
-					if (verbose)
-						printf("%u: skip, HT40+DFS "
-						    "not permitted\n", freq);
-					continue;
-				}
 				/* NB: HT attribute comes from caller */
 				flags &= ~IEEE80211_CHAN_HT;
 				flags |= chanFlags & IEEE80211_CHAN_HT;