aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/ath/dfs_pri_detector.c
diff options
context:
space:
mode:
authorKalle Valo <kvalo@codeaurora.org>2015-04-28 14:43:54 +0300
committerKalle Valo <kvalo@codeaurora.org>2015-04-28 14:44:19 +0300
commit73b25f66dcae45d74e1641c52a3d96d041788e4e (patch)
treee370fe6f754852c7a979580717457a05edd7f893 /drivers/net/wireless/ath/dfs_pri_detector.c
parent2decb2682f80759f631c8332f9a2a34a02150a03 (diff)
parent45c9abc059fa754aae047351742ec2d84f932f53 (diff)
downloadlinux-73b25f66dcae45d74e1641c52a3d96d041788e4e.tar.gz
linux-73b25f66dcae45d74e1641c52a3d96d041788e4e.tar.bz2
linux-73b25f66dcae45d74e1641c52a3d96d041788e4e.zip
Merge ath-next from ath.git
Major changes in ath10k: * enable channel 144 on 5 GHz * enable Adaptive Noise Immunity (ANI) by default * add Wake on Wireless LAN (WOW) patterns support * add basic Tunneled Direct Link Setup (TDLS) support * add multi-channel support for QCA6174 * enable IBSS RSN support * enable Bluetooth Coexistance whenever firmware supports it * add more versatile way to set bitrates used by the firmware
Diffstat (limited to 'drivers/net/wireless/ath/dfs_pri_detector.c')
-rw-r--r--drivers/net/wireless/ath/dfs_pri_detector.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/dfs_pri_detector.c b/drivers/net/wireless/ath/dfs_pri_detector.c
index 43b608178884..1b5ad1965607 100644
--- a/drivers/net/wireless/ath/dfs_pri_detector.c
+++ b/drivers/net/wireless/ath/dfs_pri_detector.c
@@ -390,6 +390,10 @@ static struct pri_sequence *pri_detector_add_pulse(struct pri_detector *de,
if ((ts - de->last_ts) < rs->max_pri_tolerance)
/* if delta to last pulse is too short, don't use this pulse */
return NULL;
+ /* radar detector spec needs chirp, but not detected */
+ if (rs->chirp && rs->chirp != event->chirp)
+ return NULL;
+
de->last_ts = ts;
max_updated_seq = pseq_handler_add_to_existing_seqs(de, ts);