From cd286049c92eeb262a8cb274bdf622b11c2afb02 Mon Sep 17 00:00:00 2001 From: Bruno Randolf Date: Wed, 19 May 2010 10:31:37 +0900 Subject: [PATCH] --- yaml --- r: 202771 b: refs/heads/master c: 9537a1623359fd24ec95ba1fe60528c70e84b2a2 h: refs/heads/master i: 202769: def9b5a694021c9ac395c7416dfe7f40fce19a96 202767: bc8f9987eacfea34169a2d741573ac21aad2292f v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath5k/ani.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4b18fdfa635a..cdd91d3d6355 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40ca22eafeb61ee1419dd7c4c2698459183c582c +refs/heads/master: 9537a1623359fd24ec95ba1fe60528c70e84b2a2 diff --git a/trunk/drivers/net/wireless/ath/ath5k/ani.c b/trunk/drivers/net/wireless/ath/ath5k/ani.c index f2311ab35504..987e3d3fa5cb 100644 --- a/trunk/drivers/net/wireless/ath/ath5k/ani.c +++ b/trunk/drivers/net/wireless/ath/ath5k/ani.c @@ -481,14 +481,15 @@ ath5k_ani_calibration(struct ath5k_hw *ah) struct ath5k_ani_state *as = &ah->ah_sc->ani_state; int listen, ofdm_high, ofdm_low, cck_high, cck_low; - if (as->ani_mode != ATH5K_ANI_MODE_AUTO) - return; - /* get listen time since last call and add it to the counter because we - * might not have restarted the "ani period" last time */ + * might not have restarted the "ani period" last time. + * always do this to calculate the busy time also in manual mode */ listen = ath5k_hw_ani_get_listen_time(ah, as); as->listen_time += listen; + if (as->ani_mode != ATH5K_ANI_MODE_AUTO) + return; + ath5k_ani_save_and_clear_phy_errors(ah, as); ofdm_high = as->listen_time * ATH5K_ANI_OFDM_TRIG_HIGH / 1000;