From owner-svn-src-all@FreeBSD.ORG  Sun Sep 11 09:43:14 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 576FD106566B;
	Sun, 11 Sep 2011 09:43:14 +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 466798FC13;
	Sun, 11 Sep 2011 09:43:14 +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 p8B9hEQd061088;
	Sun, 11 Sep 2011 09:43:14 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8B9hEE0061085;
	Sun, 11 Sep 2011 09:43:14 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201109110943.p8B9hEE0061085@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 11 Sep 2011 09:43:14 +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: r225473 - head/sys/dev/ath/ath_rate/sample
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: Sun, 11 Sep 2011 09:43:14 -0000

Author: adrian
Date: Sun Sep 11 09:43:13 2011
New Revision: 225473
URL: http://svn.freebsd.org/changeset/base/225473

Log:
  Fix the order of parameters passed to the HT frame duration calculation.
  
  Approved by:	re (kib)

Modified:
  head/sys/dev/ath/ath_rate/sample/sample.h

Modified: head/sys/dev/ath/ath_rate/sample/sample.h
==============================================================================
--- head/sys/dev/ath/ath_rate/sample/sample.h	Sun Sep 11 07:26:36 2011	(r225472)
+++ head/sys/dev/ath/ath_rate/sample/sample.h	Sun Sep 11 09:43:13 2011	(r225473)
@@ -199,8 +199,8 @@ static unsigned calc_usecs_unicast_packe
 			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);
+		ctsduration += ath_hal_pkt_txtime(sc->sc_ah, rt, length, rix,
+		    is_ht40, 0);
 
 		if (cts)	/* SIFS + ACK */
 			ctsduration += rt->info[cix].spAckDuration;
@@ -210,8 +210,9 @@ 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);
+	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++) {