Skip to content

Commit

Permalink
ath5k: always calculate ANI listen time
Browse files Browse the repository at this point in the history
Calculate 'listen' time also when automatic ANI is off, since this and the
"busy" time is useful information also in manual mode.

Signed-off-by: Bruno Randolf <br1@einfach.org>
Acked-by: Nick Kossifidis <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Bruno Randolf authored and John W. Linville committed Jun 2, 2010
1 parent 40ca22e commit 9537a16
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/net/wireless/ath/ath5k/ani.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 9537a16

Please sign in to comment.