From 6c5c43974e70d8188861ba35fd25cd138c674c66 Mon Sep 17 00:00:00 2001 From: Sam Leffler Date: Sun, 11 May 2008 22:11:01 +0000 Subject: [PATCH] fix typo's that broke duration calculation on protection frames --- sys/dev/ral/rt2560.c | 2 +- sys/dev/ral/rt2661.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/ral/rt2560.c b/sys/dev/ral/rt2560.c index 9fd4346fa3b7..2f651125c1a8 100644 --- a/sys/dev/ral/rt2560.c +++ b/sys/dev/ral/rt2560.c @@ -1654,7 +1654,7 @@ rt2560_sendprot(struct rt2560_softc *sc, ackrate = ieee80211_ack_rate(sc->sc_rates, rate); isshort = (ic->ic_flags & IEEE80211_F_SHPREAMBLE) != 0; - dur = ieee80211_compute_duration(sc->sc_rates, pktlen, rate, isshort); + dur = ieee80211_compute_duration(sc->sc_rates, pktlen, rate, isshort) + ieee80211_ack_duration(sc->sc_rates, rate, isshort); flags = RT2560_TX_MORE_FRAG; if (prot == IEEE80211_PROT_RTSCTS) { diff --git a/sys/dev/ral/rt2661.c b/sys/dev/ral/rt2661.c index a197f4d983d3..0bf2bc7718fb 100644 --- a/sys/dev/ral/rt2661.c +++ b/sys/dev/ral/rt2661.c @@ -1420,7 +1420,7 @@ rt2661_sendprot(struct rt2661_softc *sc, int ac, ackrate = ieee80211_ack_rate(sc->sc_rates, rate); isshort = (ic->ic_flags & IEEE80211_F_SHPREAMBLE) != 0; - dur = ieee80211_compute_duration(sc->sc_rates, pktlen, rate, isshort); + dur = ieee80211_compute_duration(sc->sc_rates, pktlen, rate, isshort) + ieee80211_ack_duration(sc->sc_rates, rate, isshort); flags = RT2661_TX_MORE_FRAG; if (prot == IEEE80211_PROT_RTSCTS) {