From owner-svn-src-all@FreeBSD.ORG  Wed May 11 09:47:48 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C80D0106566C;
	Wed, 11 May 2011 09:47:48 +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 B7E4B8FC13;
	Wed, 11 May 2011 09:47:48 +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 p4B9lmXw083749;
	Wed, 11 May 2011 09:47:48 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4B9lmlg083747;
	Wed, 11 May 2011 09:47:48 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201105110947.p4B9lmlg083747@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 11 May 2011 09:47:48 +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: r221766 - head/sys/dev/ath/ath_hal/ar5416
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 May 2011 09:47:48 -0000

Author: adrian
Date: Wed May 11 09:47:48 2011
New Revision: 221766
URL: http://svn.freebsd.org/changeset/base/221766

Log:
  Restore the RSSI threshold after writing the board values.
  
  This would be overwritten by the board initvals written in ah->writeIni().

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	Wed May 11 09:46:36 2011	(r221765)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c	Wed May 11 09:47:48 2011	(r221766)
@@ -157,9 +157,6 @@ ar5416Reset(struct ath_hal *ah, HAL_OPMO
 		FAIL(HAL_EIO);
 	}
 
-	/* Restore bmiss rssi & count thresholds */
-	OS_REG_WRITE(ah, AR_RSSI_THR, rssiThrReg);
-
 	/* Restore TSF */
 	if (tsf)
 		ar5212SetTsf64(ah, tsf);
@@ -270,6 +267,9 @@ ar5416Reset(struct ath_hal *ah, HAL_OPMO
 
 	OS_REG_WRITE(ah, AR_ISR, ~0);		/* cleared on write */
 
+	/* Restore bmiss rssi & count thresholds */
+	OS_REG_WRITE(ah, AR_RSSI_THR, rssiThrReg);
+
 	if (!ar5212SetChannel(ah, chan))
 		FAIL(HAL_EIO);