linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Felix Fietkau <nbd@nbd.name>
To: linux-wireless@vger.kernel.org
Cc: kvalo@codeaurora.org
Subject: [PATCH 2/9] ath9k: don't run periodic and nf calibation at the same time
Date: Mon, 23 Jul 2018 18:02:53 +0200	[thread overview]
Message-ID: <20180723160300.58024-2-nbd@nbd.name> (raw)
In-Reply-To: <20180723160300.58024-1-nbd@nbd.name>

The checks already prevents periodic cal from being started while noise
floor calibration runs. It is missing checks for the other way around.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
 drivers/net/wireless/ath/ath9k/ar9002_calib.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/ar9002_calib.c b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
index 50fcd343c41a..fd9db8ca99d7 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
@@ -676,10 +676,10 @@ static int ar9002_hw_calibrate(struct ath_hw *ah, struct ath9k_channel *chan,
 			return 0;
 
 		ah->cal_list_curr = currCal = currCal->calNext;
-		if (currCal->calState == CAL_WAITING) {
+		if (currCal->calState == CAL_WAITING)
 			ath9k_hw_reset_calibration(ah, currCal);
-			return 0;
-		}
+
+		return 0;
 	}
 
 	/* Do NF cal only at longer intervals */
-- 
2.17.0

  reply	other threads:[~2018-07-23 17:05 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-23 16:02 [PATCH 1/9] ath9k_hw: set spectral scan enable bit on trigger for AR9003+ Felix Fietkau
2018-07-23 16:02 ` Felix Fietkau [this message]
2018-07-23 16:02 ` [PATCH 3/9] ath9k: force rx_clear when disabling rx Felix Fietkau
2018-07-30 18:07   ` Kalle Valo
2018-07-23 16:02 ` [PATCH 4/9] ath9k: fix moredata bit in PS buffered frame release Felix Fietkau
2018-07-30 18:08   ` Kalle Valo
2018-07-23 16:02 ` [PATCH 5/9] ath9k: clear potentially stale EOSP status bit in intermediate queues Felix Fietkau
2018-07-23 16:02 ` [PATCH 6/9] ath9k: report tx status on EOSP Felix Fietkau
2018-07-23 16:02 ` [PATCH 7/9] ath9k: fix block-ack window tracking issues Felix Fietkau
2018-07-23 16:02 ` [PATCH 8/9] ath9k_hw: fix channel maximum power level test Felix Fietkau
2018-07-23 16:03 ` [PATCH 9/9] ath9k: fix more-data flag for buffered multicast packets Felix Fietkau
2018-07-31  7:55 ` [PATCH 1/9] ath9k_hw: set spectral scan enable bit on trigger for AR9003+ Kalle Valo

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=20180723160300.58024-2-nbd@nbd.name \
    --to=nbd@nbd.name \
    --cc=kvalo@codeaurora.org \
    --cc=linux-wireless@vger.kernel.org \
    /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).