From owner-svn-src-head@FreeBSD.ORG  Thu May 26 16:59:43 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 191E2106566B;
	Thu, 26 May 2011 16:59:43 +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 0B0298FC18;
	Thu, 26 May 2011 16:59:43 +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 p4QGxg3e073022;
	Thu, 26 May 2011 16:59:42 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4QGxgKY073020;
	Thu, 26 May 2011 16:59:42 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201105261659.p4QGxgKY073020@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 26 May 2011 16:59:42 +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: r222316 - 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 16:59:43 -0000

Author: adrian
Date: Thu May 26 16:59:42 2011
New Revision: 222316
URL: http://svn.freebsd.org/changeset/base/222316

Log:
  Remove the three-chain scaled power check for the AR9287 - it isn't
  needed.

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

Modified: head/sys/dev/ath/ath_hal/ar9002/ar9287_reset.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9287_reset.c	Thu May 26 16:55:44 2011	(r222315)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9287_reset.c	Thu May 26 16:59:42 2011	(r222316)
@@ -114,7 +114,6 @@ ar9287SetPowerCalTable(struct ath_hal *a
 
 /* XXX hard-coded values? */
 #define REDUCE_SCALED_POWER_BY_TWO_CHAIN     6
-#define REDUCE_SCALED_POWER_BY_THREE_CHAIN   10
 
 /*
  * ar9287SetPowerPerRateTable
@@ -186,10 +185,6 @@ ar9287SetPowerPerRateTable(struct ath_ha
 		break;
 	case 2:
 		scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN;
-		break;
-	case 3:
-		scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN;
-		break;
 	default:
 		return AH_FALSE; /* Unsupported number of chains */
 	}
@@ -323,7 +318,6 @@ ar9287SetPowerPerRateTable(struct ath_ha
 }
 
 #undef REDUCE_SCALED_POWER_BY_TWO_CHAIN
-#undef REDUCE_SCALED_POWER_BY_THREE_CHAIN
 
 /*
  * This is based off of the AR5416/AR9285 code and likely could