From owner-svn-src-all@FreeBSD.ORG  Fri Jul 27 11:43:10 2012
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 DDA51106566B;
	Fri, 27 Jul 2012 11:43:10 +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 C89098FC12;
	Fri, 27 Jul 2012 11:43:10 +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 q6RBhA4A001297;
	Fri, 27 Jul 2012 11:43:10 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6RBhA6w001294;
	Fri, 27 Jul 2012 11:43:10 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201207271143.q6RBhA6w001294@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 27 Jul 2012 11:43:10 +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: r238839 - in head/sys/dev/ath: . ath_hal
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: Fri, 27 Jul 2012 11:43:11 -0000

Author: adrian
Date: Fri Jul 27 11:43:10 2012
New Revision: 238839
URL: http://svn.freebsd.org/changeset/base/238839

Log:
  Introduce a couple more fields in the rate scenario setup as part of
  (future) TPC support in the AR9300 HAL.
  
  This is effectively a no-op for the moment as (a) TPC isn't really
  supported, (b) the AR9300 HAL isn't yet public, and (c) the existing
  HAL code doesn't use these fields.
  
  Obtained from:	Qualcomm Atheros

Modified:
  head/sys/dev/ath/ath_hal/ah.h
  head/sys/dev/ath/if_ath_tx_ht.c

Modified: head/sys/dev/ath/ath_hal/ah.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah.h	Fri Jul 27 11:23:24 2012	(r238838)
+++ head/sys/dev/ath/ath_hal/ah.h	Fri Jul 27 11:43:10 2012	(r238839)
@@ -587,6 +587,8 @@ typedef struct {
 #define	HAL_RATESERIES_RTS_CTS		0x0001	/* use rts/cts w/this series */
 #define	HAL_RATESERIES_2040		0x0002	/* use ext channel for series */
 #define	HAL_RATESERIES_HALFGI		0x0004	/* use half-gi for series */
+	u_int	RateIndex;
+	u_int	tx_power_cap;
 } HAL_11N_RATE_SERIES;
 
 typedef enum {

Modified: head/sys/dev/ath/if_ath_tx_ht.c
==============================================================================
--- head/sys/dev/ath/if_ath_tx_ht.c	Fri Jul 27 11:23:24 2012	(r238838)
+++ head/sys/dev/ath/if_ath_tx_ht.c	Fri Jul 27 11:43:10 2012	(r238839)
@@ -511,6 +511,8 @@ ath_rateseries_setup(struct ath_softc *s
 			series[i].RateFlags |= HAL_RATESERIES_HALFGI;
 
 		series[i].Rate = rt->info[rc[i].rix].rateCode;
+		series[i].RateIndex = rc[i].rix;
+		series[i].tx_power_cap = 0x3f;	/* XXX for now */
 
 		/*
 		 * PktDuration doesn't include slot, ACK, RTS, etc timing -