Fix contention window calculation in sample and minstrel code

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

diff --git a/ath_rate/minstrel/minstrel.c b/ath_rate/minstrel/minstrel.c
index 947667dbcceb363c302867f189c4e48610b2cc1c..75e43437ca38d70dd6d0797fbd6cae75119238e9 100644 (file)
--- a/ath_rate/minstrel/minstrel.c
+++ b/ath_rate/minstrel/minstrel.c
@@ -283,7 +283,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;