From f10a543a92c3f2481052279864215e60d10d3e4b Mon Sep 17 00:00:00 2001 From: Rajkumar Manoharan Date: Sun, 1 Jul 2012 19:53:53 +0530 Subject: [PATCH] --- yaml --- r: 315247 b: refs/heads/master c: b73f3e78047abdcc8bc33f97445ef6691ce3cc3d h: refs/heads/master i: 315245: ccfe6aca861524391c4d05bacf79d44078b748dd 315243: eb71f7cd6a8b5abdfe4c478d237dbc5a815c54a4 315239: 42453da4a9bd3463e779a04fc2a0ee78ad5c96fb 315231: 99046ab7856b839cf39aabf34a4f1a05433cc49d v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/main.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index cce66136ecc7..ead4a4e957b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54717e5330318d53180a1f3026f617509031ee68 +refs/heads/master: b73f3e78047abdcc8bc33f97445ef6691ce3cc3d diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c index e4e73f061a22..6ce012815ba6 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/main.c +++ b/trunk/drivers/net/wireless/ath/ath9k/main.c @@ -666,8 +666,6 @@ static int ath9k_start(struct ieee80211_hw *hw) spin_unlock_bh(&sc->sc_pcu_lock); - ath9k_start_btcoex(sc); - if (ah->caps.pcie_lcr_extsync_en && common->bus_ops->extn_synch_en) common->bus_ops->extn_synch_en(common); @@ -774,8 +772,6 @@ static void ath9k_stop(struct ieee80211_hw *hw) /* Ensure HW is awake when we try to shut it down. */ ath9k_ps_wakeup(sc); - ath9k_stop_btcoex(sc); - spin_lock_bh(&sc->sc_pcu_lock); /* prevent tasklets to enable interrupts once we disable them */ @@ -1139,14 +1135,17 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) if (changed & IEEE80211_CONF_CHANGE_IDLE) { sc->ps_idle = !!(conf->flags & IEEE80211_CONF_IDLE); - if (sc->ps_idle) + if (sc->ps_idle) { ath_cancel_work(sc); - else + ath9k_stop_btcoex(sc); + } else { + ath9k_start_btcoex(sc); /* * The chip needs a reset to properly wake up from * full sleep */ reset_channel = ah->chip_fullsleep; + } } /*