diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-01-14 15:59:28 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-01-14 15:59:28 +0000 |
| commit | 721059ed00a45bb4d30c6cd3f2cf74c330336982 (patch) | |
| tree | fbc03b42b71b6a2df4d586f533894eb7ecce0430 /package/mac80211/patches/300-pending_work.patch | |
| parent | fef4cf011078377129ab3e1c2efd7e5f96a7a660 (diff) | |
| download | upstream-721059ed00a45bb4d30c6cd3f2cf74c330336982.tar.gz upstream-721059ed00a45bb4d30c6cd3f2cf74c330336982.tar.bz2 upstream-721059ed00a45bb4d30c6cd3f2cf74c330336982.zip | |
ath9k: fix a soft lockup on smp systems
Backport of r35152
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@35153 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/300-pending_work.patch')
| -rw-r--r-- | package/mac80211/patches/300-pending_work.patch | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch index c0240ad01e..69c32b8760 100644 --- a/package/mac80211/patches/300-pending_work.patch +++ b/package/mac80211/patches/300-pending_work.patch @@ -1269,15 +1269,7 @@ { struct ath_hw *ah = sc->sc_ah; bool ret = true; -@@ -195,19 +195,15 @@ static bool ath_prepare_reset(struct ath - ath9k_debug_samp_bb_mac(sc); - ath9k_hw_disable_interrupts(ah); - -+ tasklet_disable(&sc->intr_tq); -+ - if (!ath_stoprecv(sc)) - ret = false; - +@@ -201,14 +201,6 @@ static bool ath_prepare_reset(struct ath if (!ath_drain_all_txq(sc, retry_tx)) ret = false; @@ -1288,11 +1280,11 @@ - } else { - ath_flushrecv(sc); - } -+ tasklet_enable(&sc->intr_tq); - +- return ret; } -@@ -261,7 +257,6 @@ static int ath_reset_internal(struct ath + +@@ -261,11 +253,11 @@ static int ath_reset_internal(struct ath struct ath_common *common = ath9k_hw_common(ah); struct ath9k_hw_cal_data *caldata = NULL; bool fastcc = true; @@ -1300,7 +1292,12 @@ int r; __ath_cancel_work(sc); -@@ -275,11 +270,10 @@ static int ath_reset_internal(struct ath + ++ tasklet_disable(&sc->intr_tq); + spin_lock_bh(&sc->sc_pcu_lock); + + if (!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) { +@@ -275,11 +267,10 @@ static int ath_reset_internal(struct ath if (!hchan) { fastcc = false; @@ -1313,7 +1310,16 @@ fastcc = false; ath_dbg(common, CONFIG, "Reset to %u MHz, HT40: %d fastcc: %d\n", -@@ -821,7 +815,7 @@ static void ath9k_stop(struct ieee80211_ +@@ -297,6 +288,8 @@ static int ath_reset_internal(struct ath + + out: + spin_unlock_bh(&sc->sc_pcu_lock); ++ tasklet_enable(&sc->intr_tq); ++ + return r; + } + +@@ -821,7 +814,7 @@ static void ath9k_stop(struct ieee80211_ ath9k_hw_cfg_gpio_input(ah, ah->led_pin); } |