svn commit: r225473 - head/sys/dev/ath/ath_rate/sample

[Adrian Chadd]

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++) {