From owner-svn-src-head@FreeBSD.ORG  Sun Jun 26 13:43:15 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 B7B8E106564A;
	Sun, 26 Jun 2011 13:43:15 +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 A7DEC8FC0A;
	Sun, 26 Jun 2011 13:43:15 +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 p5QDhFOI054813;
	Sun, 26 Jun 2011 13:43:15 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5QDhF9l054810;
	Sun, 26 Jun 2011 13:43:15 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201106261343.p5QDhF9l054810@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 26 Jun 2011 13:43:15 +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: r223567 - in head/sys: conf dev/ath
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: Sun, 26 Jun 2011 13:43:15 -0000

Author: adrian
Date: Sun Jun 26 13:43:15 2011
New Revision: 223567
URL: http://svn.freebsd.org/changeset/base/223567

Log:
  Add ATH_ENABLE_DFS which enables the DFS flag so the DFS code
  can be tested.
  
  This doesn't at all actually do radar detection! It's just
  so developers who wish to test the net80211 DFS code can easily
  do so. Without this flag, the DFS channels are never marked
  DFS and thus the DFS stuff doesn't run.

Modified:
  head/sys/conf/options
  head/sys/dev/ath/if_ath.c

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Sun Jun 26 11:37:24 2011	(r223566)
+++ head/sys/conf/options	Sun Jun 26 13:43:15 2011	(r223567)
@@ -773,7 +773,8 @@ ATH_TXBUF		opt_ath.h
 ATH_RXBUF		opt_ath.h
 ATH_DIAGAPI		opt_ath.h
 ATH_TX99_DIAG		opt_ath.h
-ATH_ENABLE_11N		opt_ah.h
+ATH_ENABLE_11N		opt_ath.h
+ATH_ENABLE_DFS		opt_ath.h
 
 # options for the Atheros hal
 AH_SUPPORT_AR5416	opt_ah.h

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c	Sun Jun 26 11:37:24 2011	(r223566)
+++ head/sys/dev/ath/if_ath.c	Sun Jun 26 13:43:15 2011	(r223567)
@@ -528,6 +528,9 @@ ath_attach(u_int16_t devid, struct ath_s
 		| IEEE80211_C_WPA		/* capable of WPA1+WPA2 */
 		| IEEE80211_C_BGSCAN		/* capable of bg scanning */
 		| IEEE80211_C_TXFRAG		/* handle tx frags */
+#ifdef	ATH_ENABLE_DFS
+		| IEEE80211_C_DFS		/* Enable DFS radar detection */
+#endif
 		;
 	/*
 	 * Query the hal to figure out h/w crypto support.