From owner-svn-src-head@FreeBSD.ORG  Thu May 26 20:17:59 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 BA557106564A;
	Thu, 26 May 2011 20:17:59 +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 ABA3D8FC19;
	Thu, 26 May 2011 20:17:59 +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 p4QKHxCY079259;
	Thu, 26 May 2011 20:17:59 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4QKHxOB079257;
	Thu, 26 May 2011 20:17:59 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201105262017.p4QKHxOB079257@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 26 May 2011 20:17:59 +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: r222323 - 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: Thu, 26 May 2011 20:17:59 -0000

Author: adrian
Date: Thu May 26 20:17:59 2011
New Revision: 222323
URL: http://svn.freebsd.org/changeset/base/222323

Log:
  Revert this erroneous commit and re-disable the AR9285 combined antenna
  diversity.

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	Thu May 26 19:49:32 2011	(r222322)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c	Thu May 26 20:17:59 2011	(r222323)
@@ -87,10 +87,8 @@ 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;