From owner-svn-src-all@FreeBSD.ORG  Sun Sep  2 05:01:10 2012
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 E8917106564A;
	Sun,  2 Sep 2012 05:01:10 +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 D42168FC0C;
	Sun,  2 Sep 2012 05:01:10 +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 q8251A17041650;
	Sun, 2 Sep 2012 05:01:10 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8251ARi041648;
	Sun, 2 Sep 2012 05:01:10 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201209020501.q8251ARi041648@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 2 Sep 2012 05:01:10 +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: r240002 - head/sys/dev/ath/ath_dfs/null
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, 02 Sep 2012 05:01:11 -0000

Author: adrian
Date: Sun Sep  2 05:01:10 2012
New Revision: 240002
URL: http://svn.freebsd.org/changeset/base/240002

Log:
  Disable strong signal diversity when enabling radar pulse detection
  for the AR5212 era NICs.

Modified:
  head/sys/dev/ath/ath_dfs/null/dfs_null.c

Modified: head/sys/dev/ath/ath_dfs/null/dfs_null.c
==============================================================================
--- head/sys/dev/ath/ath_dfs/null/dfs_null.c	Sun Sep  2 04:56:29 2012	(r240001)
+++ head/sys/dev/ath/ath_dfs/null/dfs_null.c	Sun Sep  2 05:01:10 2012	(r240002)
@@ -132,6 +132,13 @@ ath_dfs_radar_enable(struct ath_softc *s
 
 	ath_hal_enabledfs(sc->sc_ah, &pe);
 
+	/*
+	 * Disable strong signal fast diversity - needed for
+	 * AR5212 and similar PHYs for reliable short pulse
+	 * duration.
+	 */
+	(void) ath_hal_setcapability(sc->sc_ah, HAL_CAP_DIVERSITY, 2, 0, NULL);
+
 	return (1);
 #else
 	return (0);