eliminate mid-block variable decls

This commit is contained in:
Sam Leffler 2005-03-20 01:27:33 +00:00
parent e33bea8d9e
commit 57a4a75853
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=143862

View File

@ -187,7 +187,6 @@ static unsigned calc_usecs_unicast_packet(struct ath_softc *sc,
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;
unsigned t_difs = 50;
@ -197,6 +196,9 @@ static unsigned calc_usecs_unicast_packet(struct ath_softc *sc,
int x = 0;
int cw = WIFI_CW_MIN;
int cix = rt->info[rix].controlRate;
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) {
@ -205,9 +207,6 @@ static unsigned calc_usecs_unicast_packet(struct ath_softc *sc,
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)