Fix contention window calculation in sample and minstrel code

[madwifi/.git] / ath_rate / sample / sample.c

diff --git a/ath_rate/sample/sample.c b/ath_rate/sample/sample.c
index 8c78cdd04bc13dd145fb9115f62ebd3737c40310..8417346a5343c1ff8bab3b1b33b38f174a83c323 100644 (file)
--- a/ath_rate/sample/sample.c
+++ b/ath_rate/sample/sample.c
@@ -254,7 +254,7 @@ calc_usecs_unicast_packet(struct ath_softc *sc, int length,
        tt += (long_retries+1)*ath_hal_computetxtime(sc->sc_ah, rt, length,
                                                rix, AH_TRUE);
        for (x = 0; x <= short_retries + long_retries; x++) {
-               cw = MIN(ATH_DEFAULT_CWMAX, (cw + 1) * 2);
+               cw = MIN(ATH_DEFAULT_CWMAX, (cw << 1) | 1);
                tt += (t_slot * cw / 2);
        }
        return tt;