From owner-svn-src-user@FreeBSD.ORG  Fri Jul 30 13:53:45 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C9F2E1065677;
	Fri, 30 Jul 2010 13:53:45 +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 B86298FC08;
	Fri, 30 Jul 2010 13:53:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6UDrjA5079256;
	Fri, 30 Jul 2010 13:53:45 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6UDrjfa079254;
	Fri, 30 Jul 2010 13:53:45 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201007301353.o6UDrjfa079254@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 30 Jul 2010 13:53:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210649 -
	user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jul 2010 13:53:46 -0000

Author: adrian
Date: Fri Jul 30 13:53:45 2010
New Revision: 210649
URL: http://svn.freebsd.org/changeset/base/210649

Log:
  My bad - make it compile.

Modified:
  user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c

Modified: user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
==============================================================================
--- user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c	Fri Jul 30 13:40:51 2010	(r210648)
+++ user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c	Fri Jul 30 13:53:45 2010	(r210649)
@@ -171,7 +171,6 @@ ar5416InitCal(struct ath_hal *ah, const 
 {
 	struct ar5416PerCal *cal = &AH5416(ah)->ah_cal;
 	HAL_CHANNEL_INTERNAL *ichan;
-	int i;
 
 	ichan = ath_hal_checkchannel(ah, chan);
 	HALASSERT(ichan != AH_NULL);
@@ -228,7 +227,7 @@ ar5416InitCal(struct ath_hal *ah, const 
 	 * Try to make sure the above NF cal completes, just so
 	 * it doesn't clash with subsequent percals -adrian
 	 */
-	if (! ar5416WaitNfComplete(struct ath_hal *ah, 1000)) {
+	if (! ar5416WaitNfComplete(ah, 1000)) {
 		HALDEBUG(ah, HAL_DEBUG_ANY, "%s: initial NF calibration did "
 		"not complete in time; noisy environment?\n", __func__);
 		return AH_FALSE;
@@ -414,7 +413,7 @@ ar5416PerCalibrationN(struct ath_hal *ah
 	 * override it with the current chainmask. The upper levels currently
 	 * doesn't know about the chainmask.
 	 */
-	rxchainmask = ahp->ah_rx_chainmask;
+	rxchainmask = AH5416(ah)->ah_rx_chainmask;
 
 	/* Invalid channel check */
 	ichan = ath_hal_checkchannel(ah, chan);
@@ -529,7 +528,7 @@ ar5416LoadNF(struct ath_hal *ah, const s
 		AR_PHY_CH2_EXT_CCA
 	};
 	struct ar5212NfCalHist *h;
-	int i, j;
+	int i;
 	int32_t val;
 	uint8_t chainmask;