diff options
| author | sam <sam@FreeBSD.org> | 2009-02-10 19:25:11 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2009-02-10 19:25:11 +0000 |
| commit | 22d9ca334e731876b47b0536329c8895386012a3 (patch) | |
| tree | 3811faa2dd96f651702c8b56d4d015dcd99df362 /sys/dev/ath | |
| parent | 35694b682559958b891b245e6b8056d3360504e5 (diff) | |
| download | FreeBSD-src-22d9ca334e731876b47b0536329c8895386012a3.zip FreeBSD-src-22d9ca334e731876b47b0536329c8895386012a3.tar.gz | |
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
Diffstat (limited to 'sys/dev/ath')
| -rw-r--r-- | sys/dev/ath/if_ath.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c index c9a9801..d4656ae 100644 --- a/sys/dev/ath/if_ath.c +++ b/sys/dev/ath/if_ath.c @@ -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) { |
