ath10k: fix CAC regression
authorMichal Kazior <michal.kazior@tieto.com>
Mon, 9 Mar 2015 13:20:55 +0000 (14:20 +0100)
committerKalle Valo <kvalo@qca.qualcomm.com>
Thu, 12 Mar 2015 12:30:24 +0000 (14:30 +0200)
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>
drivers/net/wireless/ath/ath10k/mac.c

index cd806c5..1f3d393 100644 (file)
@@ -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,