diff options
| author | sam <sam@FreeBSD.org> | 2005-03-20 01:27:33 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-03-20 01:27:33 +0000 |
| commit | 6a44674e68d296ac5b47e91e6dfad8e98892a0b3 (patch) | |
| tree | bd03d0a87c19447b8447f8a7391c4d3232c5ce32 | |
| parent | f9994cc85ed8ce53813bc660ba299c16c348127c (diff) | |
| download | FreeBSD-src-6a44674e68d296ac5b47e91e6dfad8e98892a0b3.zip FreeBSD-src-6a44674e68d296ac5b47e91e6dfad8e98892a0b3.tar.gz | |
eliminate mid-block variable decls
| -rw-r--r-- | sys/dev/ath/ath_rate/sample/sample.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/ath/ath_rate/sample/sample.h b/sys/dev/ath/ath_rate/sample/sample.h index 3206829..c97d23a 100644 --- a/sys/dev/ath/ath_rate/sample/sample.h +++ b/sys/dev/ath/ath_rate/sample/sample.h @@ -186,7 +186,6 @@ static unsigned calc_usecs_unicast_packet(struct ath_softc *sc, int length, int rix, int short_retries, int long_retries) { const HAL_RATE_TABLE *rt = sc->sc_currates; - /* pg 205 ieee.802.11.pdf */ unsigned t_slot = 20; @@ -197,17 +196,17 @@ static unsigned calc_usecs_unicast_packet(struct ath_softc *sc, int x = 0; int cw = WIFI_CW_MIN; int cix = rt->info[rix].controlRate; - KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode)); + int rts = 0; + int cts = 0; + KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode)); + if (rt->info[rix].phy == IEEE80211_T_OFDM) { t_slot = 9; t_sifs = 9; t_difs = 28; } - int rts = 0; - int cts = 0; - if ((ic->ic_flags & IEEE80211_F_USEPROT) && rt->info[rix].phy == IEEE80211_T_OFDM) { if (ic->ic_protmode == IEEE80211_PROT_RTSCTS) |
