diff --git a/umac/regulatory/core/src/reg_db_parser.c b/umac/regulatory/core/src/reg_db_parser.c index 41142f911022..2644056c6c4a 100644 --- a/umac/regulatory/core/src/reg_db_parser.c +++ b/umac/regulatory/core/src/reg_db_parser.c @@ -99,9 +99,9 @@ QDF_STATUS reg_get_rdpair_from_country_iso(uint8_t *alpha, reg_get_num_reg_dmn_pairs(&num_reg_dmn); for (i = 0; i < num_countries; i++) { - if ((g_all_countries[i].alpha2[0] == alpha[0]) && - (g_all_countries[i].alpha2[1] == alpha[1]) && - (g_all_countries[i].alpha2[2] == alpha[2])) + if ((g_all_countries[i].alpha2_11d[0] == alpha[0]) && + (g_all_countries[i].alpha2_11d[1] == alpha[1]) && + (g_all_countries[i].alpha2_11d[2] == alpha[2])) break; } @@ -209,8 +209,8 @@ static inline QDF_STATUS reg_get_reginfo_form_country_code_and_regdmn_pair( regdomains_5g[dmn_id_5g].num_reg_rules)) { qdf_mem_copy(reg_info->alpha2, - g_all_countries[country_index].alpha2, - sizeof(g_all_countries[country_index].alpha2)); + g_all_countries[country_index].alpha2_11d, + sizeof(g_all_countries[country_index].alpha2_11d)); reg_info->dfs_region = regdomains_5g[dmn_id_5g].dfs_region; reg_info->phybitmap = diff --git a/umac/regulatory/core/src/reg_services.c b/umac/regulatory/core/src/reg_services.c index 7c30cf5e3688..2cab5240959d 100644 --- a/umac/regulatory/core/src/reg_services.c +++ b/umac/regulatory/core/src/reg_services.c @@ -1416,9 +1416,9 @@ QDF_STATUS reg_process_master_chan_list(struct cur_regulatory_info soc_reg->phybitmap = regulat_info->phybitmap; soc_reg->dfs_region = regulat_info->dfs_region; qdf_mem_copy(soc_reg->default_country, regulat_info->alpha2, - REG_ALPHA2_LEN); + REG_ALPHA2_LEN + 1); qdf_mem_copy(soc_reg->current_country, regulat_info->alpha2, - REG_ALPHA2_LEN); + REG_ALPHA2_LEN + 1); min_bw_2g = regulat_info->min_bw_2g; max_bw_2g = regulat_info->max_bw_2g;