From: nbd Date: Wed, 31 Aug 2011 23:27:29 +0000 (+0000) Subject: ath9k: fix another crash bug (backport of r28139) X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=0fae33f97c78b22ff2a9d1be518c0cc2d2fe8dac ath9k: fix another crash bug (backport of r28139) git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28140 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/package/mac80211/patches/581-ath9k_use_reset_work.patch b/package/mac80211/patches/581-ath9k_use_reset_work.patch index 7836718bb..810d968c4 100644 --- a/package/mac80211/patches/581-ath9k_use_reset_work.patch +++ b/package/mac80211/patches/581-ath9k_use_reset_work.patch @@ -173,7 +173,7 @@ +void ath_reset_work(struct work_struct *work) +{ -+ struct ath_softc *sc = container_of(work, struct ath_softc, hw_check_work); ++ struct ath_softc *sc = container_of(work, struct ath_softc, hw_reset_work); + + spin_lock_bh(&sc->sc_pcu_lock); + ath_reset(sc, true); diff --git a/package/mac80211/patches/582-ath9k_merge_reset_functions.patch b/package/mac80211/patches/582-ath9k_merge_reset_functions.patch index ff491a4a9..975d2106f 100644 --- a/package/mac80211/patches/582-ath9k_merge_reset_functions.patch +++ b/package/mac80211/patches/582-ath9k_merge_reset_functions.patch @@ -342,7 +342,7 @@ return r; @@ -971,9 +952,7 @@ void ath_reset_work(struct work_struct * { - struct ath_softc *sc = container_of(work, struct ath_softc, hw_check_work); + struct ath_softc *sc = container_of(work, struct ath_softc, hw_reset_work); - spin_lock_bh(&sc->sc_pcu_lock); ath_reset(sc, true);