From efa9f5d2a9f2e5afa2582c621dbbbfdf8fa3d256 Mon Sep 17 00:00:00 2001 From: Yu Ouyang Date: Thu, 19 Dec 2019 23:11:28 +0800 Subject: [PATCH] qcacmn: Add FCC10_FCCA into arry g_reg_dmn_pairs[] When enalbe DSRC feature, member reg_dmn_pair_id of struct country_code_to_reg_domain g_all_countries[] may equal FCC10_FCCA. However, FCC10_FCCA can't be found in array g_reg_dmn_pairs[]. So, add FCC10_FCCA into arry g_reg_dmn_pairs[]. And, fix one compile issue. Change-Id: I6069c43505e15312d8bd9be48495998c31f1f8eb CRs-Fixed: 2590094 --- umac/regulatory/core/src/reg_db.c | 1 + umac/regulatory/core/src/reg_utils.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/umac/regulatory/core/src/reg_db.c b/umac/regulatory/core/src/reg_db.c index f175aac96c68..61b097053c33 100644 --- a/umac/regulatory/core/src/reg_db.c +++ b/umac/regulatory/core/src/reg_db.c @@ -1024,6 +1024,7 @@ const struct reg_domain_pair g_reg_dmn_pairs[] = { {FCC6_WORLD, FCC6, WORLD}, {FCC6_FCCA, FCC6, FCCA}, {FCC8_FCCA, FCC8, FCCA}, + {FCC10_FCCA, FCC10, FCCA}, {FCC11_WORLD, FCC11, WORLD}, {FCC13_WORLD, FCC13, WORLD}, {FCC14_FCCB, FCC14, FCCB}, diff --git a/umac/regulatory/core/src/reg_utils.c b/umac/regulatory/core/src/reg_utils.c index 61f63f922922..c36b8fa9fbc1 100644 --- a/umac/regulatory/core/src/reg_utils.c +++ b/umac/regulatory/core/src/reg_utils.c @@ -333,7 +333,7 @@ bool reg_is_passive_or_disable_for_freq(struct wlan_objmgr_pdev *pdev, #ifdef CONFIG_CHAN_FREQ_API bool reg_is_dsrc_freq(qdf_freq_t freq) { - if (!REG_IS_5GHZ_FREQ(chan)) + if (!REG_IS_5GHZ_FREQ(freq)) return false; if (!(freq >= REG_DSRC_START_FREQ && freq <= REG_DSRC_END_FREQ))