[Madwifi-cvs] madwifi/driver if_ath.c,1.129,1.130
Status: Beta
Brought to you by:
otaku
From: <sam...@us...> - 2004-02-05 21:32:47
|
Update of /cvsroot/madwifi/madwifi/driver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4362 Modified Files: if_ath.c Log Message: white space changes to sync with forthcoming code and/or bsd Index: if_ath.c =================================================================== RCS file: /cvsroot/madwifi/madwifi/driver/if_ath.c,v retrieving revision 1.129 retrieving revision 1.130 diff -C2 -d -r1.129 -r1.130 *** if_ath.c 5 Feb 2004 21:20:28 -0000 1.129 --- if_ath.c 5 Feb 2004 21:30:09 -0000 1.130 *************** *** 373,377 **** /* ! * Interrupt handler. All the actual processing is * deferred to tasklets. */ --- 373,377 ---- /* ! * Interrupt handler. Most of the actual processing is * deferred to tasklets. */ *************** *** 387,392 **** if (sc->sc_invalid) { /* ! * The hardware is gone, or HAL isn't yet initialized. ! * Don't touch anything. */ return IRQ_NONE; --- 387,392 ---- if (sc->sc_invalid) { /* ! * The hardware is not ready/present, don't touch anything. ! * Note this can happen early on if the IRQ is shared. */ return IRQ_NONE; *************** *** 422,428 **** if (status & HAL_INT_RXEOL) { /* ! * XXX The hardware should re-read the link when ! * RXE bit is written, but it doesn't work at least ! * on older revision of the hardware. */ sc->sc_stats.ast_rxeol++; --- 422,428 ---- if (status & HAL_INT_RXEOL) { /* ! * NB: the hardware should re-read the link when ! * RXE bit is written, but it doesn't work at ! * least on older hardware revs. */ sc->sc_stats.ast_rxeol++; *************** *** 484,489 **** KASSERT(ic->ic_opmode == IEEE80211_M_STA, ("unexpect operating mode %u", ic->ic_opmode)); ! if (ic->ic_state == IEEE80211_S_RUN) ! ieee80211_new_state(dev, IEEE80211_S_ASSOC, 0); } --- 484,496 ---- KASSERT(ic->ic_opmode == IEEE80211_M_STA, ("unexpect operating mode %u", ic->ic_opmode)); ! if (ic->ic_state == IEEE80211_S_RUN) { ! /* ! * Rather than go directly to scan state, try to ! * reassociate first. If that fails then the state ! * machine will drop us into scanning after timing ! * out waiting for a probe response. ! */ ! ieee80211_new_state(dev, IEEE80211_S_ASSOC, -1); ! } } *************** *** 939,942 **** --- 946,950 ---- int i; + /* XXX maybe should reset all keys when !WEPON */ for (i = 0; i < IEEE80211_WEP_NKID; i++) { struct ieee80211_wepkey *k = &ic->ic_nw_keys[i]; *************** *** 1222,1225 **** --- 1230,1236 ---- } + /* + * Reclaim beacon resources. + */ static void ath_beacon_free(struct ath_softc *sc) *************** *** 1942,1947 **** * (B, 255, N) with 3 <= B < 8 */ ! if (iv >= 0x03ff00 && ! (iv & 0xf8ff00) == 0x00ff00) iv += 0x000100; ic->ic_iv = iv + 1; --- 1953,1957 ---- * (B, 255, N) with 3 <= B < 8 */ ! if (iv >= 0x03ff00 && (iv & 0xf8ff00) == 0x00ff00) iv += 0x000100; ic->ic_iv = iv + 1; *************** *** 2158,2161 **** --- 2168,2175 ---- ds->ds_hw[0], ds->ds_hw[1])); + /* + * Insert the frame on the outbound list and + * pass it on to the hardware. + */ spin_lock_bh(&sc->sc_txqlock); TAILQ_INSERT_TAIL(&sc->sc_txq, bf, bf_list); |