summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorRajkumar Manoharan2011-01-31 19:17:46 +0100
committerJohn W. Linville2011-02-03 22:44:43 +0100
commit4c89fe954d929781126af41691fba1bc670293a5 (patch)
tree7ce2e88e15890b5ca7005561a842b16c5434ddcd /drivers/net
parentath9k_htc: make use common of function to update txpower (diff)
downloadkernel-qcow2-linux-4c89fe954d929781126af41691fba1bc670293a5.tar.gz
kernel-qcow2-linux-4c89fe954d929781126af41691fba1bc670293a5.tar.xz
kernel-qcow2-linux-4c89fe954d929781126af41691fba1bc670293a5.zip
ath9k: do not access hw registers in FULL SLEEP
The opmode recalculation is accessing hw registers. When it is called from remove interface callback and if there are no vifs present then hw is moved to FULL SLEEP by radio disable. So use power save wrappers before accessing hw registers in calculating opmode state. Signed-off-by: Rajkumar Manoharan <rmanoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ath/ath9k/main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 09eb0265b312..c9925e943bc0 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1354,6 +1354,7 @@ static void ath9k_calculate_summary_state(struct ieee80211_hw *hw,
ath9k_calculate_iter_data(hw, vif, &iter_data);
+ ath9k_ps_wakeup(sc);
/* Set BSSID mask. */
memcpy(common->bssidmask, iter_data.mask, ETH_ALEN);
ath_hw_setbssidmask(common);
@@ -1388,6 +1389,7 @@ static void ath9k_calculate_summary_state(struct ieee80211_hw *hw,
}
ath9k_hw_set_interrupts(ah, ah->imask);
+ ath9k_ps_restore(sc);
/* Set up ANI */
if ((iter_data.naps + iter_data.nadhocs) > 0) {