From owner-svn-src-user@FreeBSD.ORG  Mon Sep  5 07:36:17 2011
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 26A99106564A;
	Mon,  5 Sep 2011 07:36:17 +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 158028FC16;
	Mon,  5 Sep 2011 07:36:17 +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 p857aGeA026074;
	Mon, 5 Sep 2011 07:36:16 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p857aGXY026072;
	Mon, 5 Sep 2011 07:36:16 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201109050736.p857aGXY026072@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 5 Sep 2011 07:36:16 +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: r225385 -
	user/adrian/if_ath_tx/sys/dev/ath/ath_rate/sample
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: Mon, 05 Sep 2011 07:36:17 -0000

Author: adrian
Date: Mon Sep  5 07:36:16 2011
New Revision: 225385
URL: http://svn.freebsd.org/changeset/base/225385

Log:
  Fix the ht40/preamble flag, I had those around the wrong way.

Modified:
  user/adrian/if_ath_tx/sys/dev/ath/ath_rate/sample/sample.h

Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_rate/sample/sample.h
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/ath_rate/sample/sample.h	Mon Sep  5 06:54:13 2011	(r225384)
+++ user/adrian/if_ath_tx/sys/dev/ath/ath_rate/sample/sample.h	Mon Sep  5 07:36:16 2011	(r225385)
@@ -198,9 +198,8 @@ static unsigned calc_usecs_unicast_packe
 		if (rts)		/* SIFS + CTS */
 			ctsduration += rt->info[cix].spAckDuration;
 
-		/* XXX assumes short preamble */
-		/* XXX assumes HT/20; the node info isn't yet available here */
-		ctsduration += ath_hal_pkt_txtime(sc->sc_ah, rt, length, rix, 0, is_ht40);
+		/* XXX no shortgi flag yet? */
+		ctsduration += ath_hal_pkt_txtime(sc->sc_ah, rt, length, rix, is_ht40, 0);
 
 		if (cts)	/* SIFS + ACK */
 			ctsduration += rt->info[cix].spAckDuration;
@@ -209,9 +208,8 @@ static unsigned calc_usecs_unicast_packe
 	}
 	tt += t_difs;
 
-	/* XXX assumes short preamble */
-	/* XXX assumes HT/20; the node info isn't yet available here */
-	tt += (long_retries+1)*ath_hal_pkt_txtime(sc->sc_ah, rt, length, rix, 0, is_ht40);
+	/* XXX no shortgi flag yet? */
+	tt += (long_retries+1)*ath_hal_pkt_txtime(sc->sc_ah, rt, length, rix, is_ht40, 0);
 	tt += (long_retries+1)*(t_sifs + rt->info[rix].spAckDuration);
 
 	for (x = 0; x <= short_retries + long_retries; x++) {