From: Michal Kazior <michal.kazior@tieto.com>
Date: Mon, 9 Mar 2015 13:20:55 +0000 (+0100)
Subject: ath10k: fix CAC regression
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bff414c3d2cb327d4fff22277ac89b8e00d70164;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

ath10k: fix CAC regression

Commit 548462133d98 ("ath10k: fix interrupt storm") introduced a
regression. The condition responsible for bringing up monitor vdev was broken
and it was never started for CAC so effectivelly CAC would not detect radar
pulses.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
---

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index cd806c50f3cb..1f3d393b3877 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -856,7 +856,7 @@ static int ath10k_monitor_recalc(struct ath10k *ar)
 	lockdep_assert_held(&ar->conf_mutex);
 
 	should_start = ar->monitor ||
-		       !ath10k_mac_should_disable_promisc(ar);
+		       !ath10k_mac_should_disable_promisc(ar) ||
 		       test_bit(ATH10K_CAC_RUNNING, &ar->dev_flags);
 
 	ath10k_dbg(ar, ATH10K_DBG_MAC,