d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the order of parameters passed to the HT frame duration calculation.

Browse Source 
Approved by:	re (kib)
This commit is contained in:
adrian 2011-09-11 09:43:13 +00:00
parent 51e6bf127c
commit b7f3e89486
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/ath/ath_rate/sample/sample.h
View File

@ -199,8 +199,8 @@ static unsigned calc_usecs_unicast_packet(struct ath_softc *sc,
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_packet(struct ath_softc *sc,
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++) {