diff --git a/umac/dfs/core/src/filtering/dfs_process_phyerr.c b/umac/dfs/core/src/filtering/dfs_process_phyerr.c index 913f81741bd9..4dee95054822 100644 --- a/umac/dfs/core/src/filtering/dfs_process_phyerr.c +++ b/umac/dfs/core/src/filtering/dfs_process_phyerr.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2020 The Linux Foundation. All rights reserved. * Copyright (c) 2002-2010, Atheros Communications Inc. * * Permission to use, copy, modify, and/or distribute this software for any @@ -655,7 +655,8 @@ void dfs_process_phyerr(struct wlan_dfs *dfs, void *buf, uint16_t datalen, * BIN 5 chirping pulses are only for FCC or Japan MMK4 domain */ if (((dfs->dfsdomain == DFS_FCC_DOMAIN) || - (dfs->dfsdomain == DFS_MKK4_DOMAIN)) && + (dfs->dfsdomain == DFS_MKK4_DOMAIN) || + (dfs->dfsdomain == DFS_MKKN_DOMAIN)) && (e.dur >= MAYBE_BIN5_DUR) && (e.dur < MAX_BIN5_DUR)) { int add_dur; int slope = 0, dc_found = 0; @@ -693,7 +694,8 @@ void dfs_process_phyerr(struct wlan_dfs *dfs, void *buf, uint16_t datalen, * MAX_BIN5_DUR or less than MAYBE_BIN5_DUR */ if ((dfs->dfsdomain == DFS_FCC_DOMAIN) || - (dfs->dfsdomain == DFS_MKK4_DOMAIN)) { + (dfs->dfsdomain == DFS_MKK4_DOMAIN) || + (dfs->dfsdomain == DFS_MKKN_DOMAIN)) { /* * Would this result in very large pulses * wrapping around to become short pulses? diff --git a/umac/dfs/core/src/filtering/dfs_process_radarevent.c b/umac/dfs/core/src/filtering/dfs_process_radarevent.c index 3d913ef84872..d3e2cb05b91f 100644 --- a/umac/dfs/core/src/filtering/dfs_process_radarevent.c +++ b/umac/dfs/core/src/filtering/dfs_process_radarevent.c @@ -119,7 +119,8 @@ static inline void dfs_dur_check( uint32_t diff_ts) { if ((dfs->dfsdomain == DFS_FCC_DOMAIN || - dfs->dfsdomain == DFS_MKK4_DOMAIN) && + dfs->dfsdomain == DFS_MKK4_DOMAIN || + dfs->dfsdomain == DFS_MKKN_DOMAIN) && ((chan->dfs_ch_flags & WLAN_CHAN_VHT80) == WLAN_CHAN_VHT80) && (DFS_DIFF(chan->dfs_ch_freq, chan->dfs_ch_mhz_freq_seg1) == DFS_WAR_30_MHZ_SEPARATION) && @@ -750,7 +751,8 @@ static inline int dfs_handle_missing_pulses( struct wlan_dfs *dfs, struct dfs_channel *chan) { - if ((dfs->dfsdomain == DFS_MKK4_DOMAIN) && + if ((dfs->dfsdomain == DFS_MKK4_DOMAIN || + dfs->dfsdomain == DFS_MKKN_DOMAIN) && (dfs->dfs_caps.wlan_chip_is_bb_tlv) && (chan->dfs_ch_freq < FREQ_5500_MHZ)) { dfs->dfs_pri_multiplier = DFS_W53_DEFAULT_PRI_MULTIPLIER;