From: Vasanthakumar Thiagarajan Date: Fri, 1 Jul 2016 11:07:25 +0000 (+0530) Subject: ath10k: fix possible wrong rx_busy time reporting in QCA4019 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c11e99396d0f77b5a6adc25f7c7bd84750194724;p=linux-beck.git ath10k: fix possible wrong rx_busy time reporting in QCA4019 As hw cycle counters in QCA4019 wraparound independantly in QCA4019 it is possible cycle counter and rx clear counter would wraparound at the same time. Current logic assumes only one of the counters would wraparound at anytime. Fix this by moving 'else' part to another 'if'. Fixes: 8e100354a98 ("ath10k: fix cycle counter wraparound handling for QCA4019") Signed-off-by: Vasanthakumar Thiagarajan Reviewed-by: Julian Calaby Signed-off-by: Kalle Valo --- diff --git a/drivers/net/wireless/ath/ath10k/hw.c b/drivers/net/wireless/ath/ath10k/hw.c index f1e0695556b9..f903d468dbe6 100644 --- a/drivers/net/wireless/ath/ath10k/hw.c +++ b/drivers/net/wireless/ath/ath10k/hw.c @@ -204,7 +204,8 @@ void ath10k_hw_fill_survey_time(struct ath10k *ar, struct survey_info *survey, case ATH10K_HW_CC_WRAP_SHIFTED_EACH: if (cc < cc_prev) cc_fix = 0x7fffffff; - else + + if (rcc < rcc_prev) rcc_fix = 0x7fffffff; break; case ATH10K_HW_CC_WRAP_DISABLED: