svn commit: r188445 - head/sys/dev/ath
Sam Leffler
sam at FreeBSD.org
Tue Feb 10 11:25:12 PST 2009
Author: sam
Date: Tue Feb 10 19:25:11 2009
New Revision: 188445
URL: http://svn.freebsd.org/changeset/base/188445
Log:
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
Modified:
head/sys/dev/ath/if_ath.c
Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c Tue Feb 10 19:23:25 2009 (r188444)
+++ head/sys/dev/ath/if_ath.c Tue Feb 10 19:25:11 2009 (r188445)
@@ -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) {
More information about the svn-src-head
mailing list