diff options
| author | adrian <adrian@FreeBSD.org> | 2011-09-11 09:43:13 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2011-09-11 09:43:13 +0000 |
| commit | b7f3e8948600e128e76a31a3695c9675459d69c7 (patch) | |
| tree | adcb6cfd52c86670ab4af3d3f7df63e133ba5da5 /sys | |
| parent | 51e6bf127c1adb88842f4c0c83102e00d45f2731 (diff) | |
| download | FreeBSD-src-b7f3e8948600e128e76a31a3695c9675459d69c7.zip FreeBSD-src-b7f3e8948600e128e76a31a3695c9675459d69c7.tar.gz | |
Fix the order of parameters passed to the HT frame duration calculation.
Approved by: re (kib)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ath/ath_rate/sample/sample.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/ath/ath_rate/sample/sample.h b/sys/dev/ath/ath_rate/sample/sample.h index d61868d..b39e0be 100644 --- a/sys/dev/ath/ath_rate/sample/sample.h +++ b/sys/dev/ath/ath_rate/sample/sample.h @@ -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++) { |
