From owner-svn-src-head@FreeBSD.ORG  Wed Aug 29 04:11:00 2012
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 BD63E1065678;
	Wed, 29 Aug 2012 04:11:00 +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 A781F8FC1A;
	Wed, 29 Aug 2012 04:11:00 +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 q7T4B0gp080189;
	Wed, 29 Aug 2012 04:11:00 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7T4B0bM080187;
	Wed, 29 Aug 2012 04:11:00 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201208290411.q7T4B0bM080187@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 29 Aug 2012 04:11:00 +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: r239803 - head/sys/dev/ath/ath_hal/ar9002
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, 29 Aug 2012 04:11:01 -0000

Author: adrian
Date: Wed Aug 29 04:11:00 2012
New Revision: 239803
URL: http://svn.freebsd.org/changeset/base/239803

Log:
  Set the HAL combined antenna diversity capability if the AR9285
  EEPROM settings allow it.

Modified:
  head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c

Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c	Wed Aug 29 04:09:54 2012	(r239802)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c	Wed Aug 29 04:11:00 2012	(r239803)
@@ -504,6 +504,9 @@ ar9285FillCapabilityInfo(struct ath_hal 
 	pCap->halTxStreams = 1;
 	pCap->halRxStreams = 1;
 
+	if (ar9285_check_div_comb(ah))
+		pCap->halAntDivCombSupport = AH_TRUE;
+
 	pCap->halCSTSupport = AH_TRUE;
 	pCap->halRifsRxSupport = AH_TRUE;
 	pCap->halRifsTxSupport = AH_TRUE;