linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bruno Randolf <br1@einfach.org>
To: linville@tuxdriver.com
Cc: ath5k-devel@lists.ath5k.org, linux-wireless@vger.kernel.org
Subject: [PATCH 11/12] ath5k: always calculate ANI listen time
Date: Wed, 12 May 2010 18:40:39 +0900	[thread overview]
Message-ID: <20100512094039.6575.9705.stgit@tt-desk> (raw)
In-Reply-To: <20100512093947.6575.99595.stgit@tt-desk>

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>
---
 drivers/net/wireless/ath/ath5k/ani.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/ath/ath5k/ani.c b/drivers/net/wireless/ath/ath5k/ani.c
index f2311ab..987e3d3 100644
--- a/drivers/net/wireless/ath/ath5k/ani.c
+++ b/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;


  parent reply	other threads:[~2010-05-12  9:40 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-12  9:39 [PATCH 01/12] ath5k: add debugfs file for queue debugging Bruno Randolf
2010-05-12  9:39 ` [PATCH 02/12] ath5k: wake queues on reset Bruno Randolf
2010-05-12  9:39 ` [PATCH 03/12] ath5k: initialize calibration timers Bruno Randolf
2010-05-12  9:40 ` [PATCH 04/12] ath5k: move noise floor calibration into tasklet Bruno Randolf
2010-05-12  9:40 ` [PATCH 05/12] ath5k: Stop queues only for NF calibration Bruno Randolf
2010-05-12  9:40 ` [PATCH 06/12] ath5k: run NF calibration only every 60 seconds Bruno Randolf
2010-05-12  9:40 ` [PATCH 07/12] ath5k: remove ATH_TRACE macro Bruno Randolf
2010-05-12  9:40 ` [PATCH 08/12] ath5k: clarify logic when to enable spur mitigation filter Bruno Randolf
2010-05-12  9:40 ` [PATCH 09/12] ath5k: use ath5k_softc as driver data Bruno Randolf
2010-05-12  9:40 ` [PATCH 10/12] ath5k: add sysfs files for ANI parameters Bruno Randolf
2010-05-12  9:40 ` Bruno Randolf [this message]
2010-05-12  9:40 ` [PATCH 12/12] ath5k: print error message if ANI levels are out of range Bruno Randolf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100512094039.6575.9705.stgit@tt-desk \
    --to=br1@einfach.org \
    --cc=ath5k-devel@lists.ath5k.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).