From owner-svn-src-head@FreeBSD.ORG  Sat May 14 04:17:16 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 D48DD106566C;
	Sat, 14 May 2011 04:17:16 +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 C4F8F8FC0A;
	Sat, 14 May 2011 04:17:16 +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 p4E4HGqe092406;
	Sat, 14 May 2011 04:17:16 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4E4HGIO092404;
	Sat, 14 May 2011 04:17:16 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201105140417.p4E4HGIO092404@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 14 May 2011 04:17:16 +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: r221876 - head/sys/dev/ath/ath_hal/ar5416
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: Sat, 14 May 2011 04:17:16 -0000

Author: adrian
Date: Sat May 14 04:17:16 2011
New Revision: 221876
URL: http://svn.freebsd.org/changeset/base/221876

Log:
  Major fix: when doing open-loop TX power calibration, adjust
  the correct CCK rates rather than adjusting the first handful.
  This may have affected some AR9280 based NICs.
  
  Minor fix: merlin check update

Modified:
  head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c

Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c	Sat May 14 04:05:23 2011	(r221875)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c	Sat May 14 04:17:16 2011	(r221876)
@@ -1053,9 +1053,9 @@ ar5416SetTransmitPower(struct ath_hal *a
         int cck_ofdm_delta = 2;
 	int i;
 	for (i = 0; i < N(adj); i++) {
-            ratesArray[i] -= cck_ofdm_delta;
-	    if (ratesArray[i] < 0)
-	        ratesArray[i] = 0;
+            ratesArray[adj[i]] -= cck_ofdm_delta;
+	    if (ratesArray[adj[i]] < 0)
+	        ratesArray[adj[i]] = 0;
         }
     }
 
@@ -2430,7 +2430,7 @@ ar5416GetGainBoundariesAndPdadcs(struct 
 
         /* Find starting index for this pdGain */
         if (i == 0) {
-            if (AR_SREV_MERLIN_20_OR_LATER(ah))
+            if (AR_SREV_MERLIN_10_OR_LATER(ah))
                 ss = (int16_t)(0 - (minPwrT4[i] / 2));
             else
                 ss = 0; /* for the first pdGain, start from index 0 */