From owner-svn-src-head@FreeBSD.ORG  Wed Jun  5 22:23:13 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A1A26724;
 Wed,  5 Jun 2013 22:23:13 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9223F17B1;
 Wed,  5 Jun 2013 22:23:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r55MNDOH069607;
 Wed, 5 Jun 2013 22:23:13 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r55MND2f069606;
 Wed, 5 Jun 2013 22:23:13 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201306052223.r55MND2f069606@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 5 Jun 2013 22:23:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251442 - head/sys/dev/ath/ath_hal/ar9002
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 05 Jun 2013 22:23:13 -0000

Author: adrian
Date: Wed Jun  5 22:23:13 2013
New Revision: 251442
URL: http://svnweb.freebsd.org/changeset/base/251442

Log:
  Enable slow diversity combining for the AR9285.
  
  Now that I understand what's going on - and the RX antenna array maps
  to what the receive LNA configuration actually is - I feel comfortable
  in enabling this.
  
  If people do have issues with this, there's enough debugging now available
  that we have a chance to diagnose it without writing it up as 'weird
  crap.'
  
  Tested:
  
  * AR9285 STA w/ diversity combining enabled in EEPROM
  
  TODO:
  
  * (More) testing in hostap mode

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

Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c	Wed Jun  5 22:21:13 2013	(r251441)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c	Wed Jun  5 22:23:13 2013	(r251442)
@@ -87,8 +87,10 @@ ar9285_check_div_comb(struct ath_hal *ah
 	HAL_EEPROM_v4k *ee = AH_PRIVATE(ah)->ah_eeprom;
         const MODAL_EEP4K_HEADER *pModal = &ee->ee_base.modalHeader;
 
+#if 0
 	/* For now, simply disable this until it's better debugged. -adrian */
 	return AH_FALSE;
+#endif
 
 	if (! AR_SREV_KITE(ah))
 		return AH_FALSE;