diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-26 11:32:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-26 11:32:28 -0700 |
| commit | 78fd9c4491a9c4cf8b401f1c5a516d3d28d3b42b (patch) | |
| tree | aa65a89a09cd28f7b305c4f27a47903996b5b365 /drivers/net/wireless/ath/ath9k/main.c | |
| parent | b9958a951ed4f8adff9ce02c2b1cb4ede8e2aa0e (diff) | |
| parent | 822395b591db32ad3cf8a5b57b0fe30fb8d12c37 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 3ff0e476c2b3..c6ec800d7a6b 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -182,6 +182,9 @@ static void ath_update_survey_stats(struct ath_softc *sc) struct ath_cycle_counters *cc = &common->cc_survey; unsigned int div = common->clockrate * 1000; + if (!ah->curchan) + return; + if (ah->power_mode == ATH9K_PM_AWAKE) ath_hw_cycle_counters_update(common); @@ -577,7 +580,7 @@ void ath_hw_check(struct work_struct *work) msleep(1); } - ath_reset(sc, false); + ath_reset(sc, true); out: ath9k_ps_restore(sc); @@ -595,7 +598,7 @@ void ath9k_tasklet(unsigned long data) ath9k_ps_wakeup(sc); if (status & ATH9K_INT_FATAL) { - ath_reset(sc, false); + ath_reset(sc, true); ath9k_ps_restore(sc); return; } |