on resume ah_curchan may be NULL if no channel change has been done;

workaround this by passing net80211's channel as we know it'll never
be null

Submitted by:	trasz
This commit is contained in:
sam 2009-02-10 19:25:11 +00:00
parent 35694b6825
commit 22d9ca334e

View File

@ -1201,7 +1201,9 @@ ath_resume(struct ath_softc *sc)
* Must reset the chip before we reload the
* keycache as we were powered down on suspend.
*/
ath_hal_reset(ah, sc->sc_opmode, sc->sc_curchan, AH_FALSE, &status);
ath_hal_reset(ah, sc->sc_opmode,
sc->sc_curchan != NULL ? sc->sc_curchan : ic->ic_curchan,
AH_FALSE, &status);
ath_reset_keycache(sc);
if (sc->sc_resume_up) {
if (ic->ic_opmode == IEEE80211_M_STA) {