From f682392d3e280cbcde9b9b49edeae5f71510ee26 Mon Sep 17 00:00:00 2001 From: Lincoln Tran Date: Thu, 9 Apr 2020 13:52:30 -0700 Subject: [PATCH] qcacmn: Update country to have correct phymode map The following 3 countries will not support 802.11ax: 1) Belarus 2) Russia 3) Ukraine This change updates the phymode bitmap for those countries. Change-Id: I8cd293341d82446cfb5f99eb912a925f4f3398b3 CRs-fixed: 2658290 --- umac/regulatory/core/src/reg_db.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/umac/regulatory/core/src/reg_db.c b/umac/regulatory/core/src/reg_db.c index 269f11bd0a03..b34b971a5ab6 100644 --- a/umac/regulatory/core/src/reg_db.c +++ b/umac/regulatory/core/src/reg_db.c @@ -337,7 +337,7 @@ const struct country_code_to_reg_domain g_all_countries[] = { {CTRY_BAHRAIN, APL15_WORLD, "BH", 40, 160, 0}, {CTRY_BANGLADESH, APL1_WORLD, "BD", 40, 160, 0}, {CTRY_BARBADOS, FCC2_WORLD, "BB", 40, 160, 0}, - {CTRY_BELARUS, ETSI1_WORLD, "BY", 40, 160, 0}, + {CTRY_BELARUS, ETSI1_WORLD, "BY", 40, 160, REGULATORY_PHYMODE_NO11AX}, {CTRY_BELGIUM, ETSI1_WORLD, "BE", 40, 160, 0}, {CTRY_BELIZE, ETSI8_WORLD, "BZ", 40, 160, 0}, {CTRY_BERMUDA, FCC3_FCCA, "BM", 40, 160, 0}, @@ -466,7 +466,7 @@ const struct country_code_to_reg_domain g_all_countries[] = { {CTRY_QATAR, ETSI14_WORLD, "QA", 40, 160, 0}, {CTRY_REUNION, ETSI1_WORLD, "RE", 40, 160, 0}, {CTRY_ROMANIA, ETSI1_WORLD, "RO", 40, 160, 0}, - {CTRY_RUSSIA, ETSI8_WORLD, "RU", 40, 160, 0}, + {CTRY_RUSSIA, ETSI8_WORLD, "RU", 40, 160, REGULATORY_PHYMODE_NO11AX}, {CTRY_RWANDA, FCC3_WORLD, "RW", 40, 160, 0}, {CTRY_SAINT_BARTHELEMY, ETSI1_WORLD, "BL", 40, 160, 0}, {CTRY_SAINT_HELENA_ASCENSION_AND_TRISTAN_DA_CUNHA, ETSI1_WORLD, "SH", @@ -503,7 +503,7 @@ const struct country_code_to_reg_domain g_all_countries[] = { {CTRY_TURKEY, ETSI1_WORLD, "TR", 40, 160, 0}, {CTRY_TURKS_AND_CAICOS, FCC3_WORLD, "TC", 40, 160, 0}, {CTRY_UGANDA, FCC3_WORLD, "UG", 40, 160, 0}, - {CTRY_UKRAINE, ETSI9_WORLD, "UA", 40, 160, 0}, + {CTRY_UKRAINE, ETSI9_WORLD, "UA", 40, 160, REGULATORY_PHYMODE_NO11AX}, {CTRY_UAE, FCC3_WORLD, "AE", 40, 160, 0}, {CTRY_UNITED_KINGDOM, ETSI1_WORLD, "GB", 40, 160, 0}, {CTRY_UNITED_STATES, FCC8_FCCA, "US", 40, 160, 0}, @@ -541,7 +541,7 @@ const struct country_code_to_reg_domain g_all_countries[] = { {CTRY_BAHRAIN, APL15_WORLD, "BH", 40, 160, 0}, {CTRY_BANGLADESH, APL1_WORLD, "BD", 40, 160, 0}, {CTRY_BARBADOS, FCC2_WORLD, "BB", 40, 160, 0}, - {CTRY_BELARUS, ETSI1_WORLD, "BY", 40, 160, 0}, + {CTRY_BELARUS, ETSI1_WORLD, "BY", 40, 160, REGULATORY_PHYMODE_NO11AX}, {CTRY_BELGIUM, ETSI10_WORLD, "BE", 40, 160, 0}, {CTRY_BELIZE, ETSI8_WORLD, "BZ", 40, 160, 0}, {CTRY_BERMUDA, FCC3_FCCA, "BM", 40, 160, 0}, @@ -671,7 +671,7 @@ const struct country_code_to_reg_domain g_all_countries[] = { {CTRY_QATAR, ETSI14_WORLD, "QA", 40, 160, 0}, {CTRY_REUNION, ETSI1_WORLD, "RE", 40, 160, 0}, {CTRY_ROMANIA, ETSI10_WORLD, "RO", 40, 160, 0}, - {CTRY_RUSSIA, ETSI8_WORLD, "RU", 40, 160, 0}, + {CTRY_RUSSIA, ETSI8_WORLD, "RU", 40, 160, REGULATORY_PHYMODE_NO11AX}, {CTRY_RWANDA, FCC3_WORLD, "RW", 40, 160, 0}, {CTRY_SAINT_BARTHELEMY, ETSI1_WORLD, "BL", 40, 160, 0}, {CTRY_SAINT_HELENA_ASCENSION_AND_TRISTAN_DA_CUNHA, ETSI10_WORLD, "SH", @@ -708,7 +708,7 @@ const struct country_code_to_reg_domain g_all_countries[] = { {CTRY_TURKEY, ETSI13_WORLD, "TR", 40, 160, 0}, {CTRY_TURKS_AND_CAICOS, FCC3_WORLD, "TC", 40, 160, 0}, {CTRY_UGANDA, FCC3_WORLD, "UG", 40, 160, 0}, - {CTRY_UKRAINE, ETSI9_WORLD, "UA", 40, 160, 0}, + {CTRY_UKRAINE, ETSI9_WORLD, "UA", 40, 160, REGULATORY_PHYMODE_NO11AX}, {CTRY_UAE, FCC3_WORLD, "AE", 40, 160, 0}, {CTRY_UNITED_KINGDOM, ETSI10_WORLD, "GB", 40, 160, 0}, {CTRY_UNITED_STATES, FCC10_FCCA, "US", 40, 160, 0}, @@ -745,7 +745,7 @@ const struct country_code_to_reg_domain g_all_countries[] = { {CTRY_BAHRAIN, APL15_WORLD, "BH", 40, 160, 0}, {CTRY_BANGLADESH, APL1_WORLD, "BD", 40, 160, 0}, {CTRY_BARBADOS, FCC2_WORLD, "BB", 40, 160, 0}, - {CTRY_BELARUS, ETSI1_WORLD, "BY", 40, 160, 0}, + {CTRY_BELARUS, ETSI1_WORLD, "BY", 40, 160, REGULATORY_PHYMODE_NO11AX}, {CTRY_BELGIUM, ETSI13_WORLD, "BE", 40, 160, 0}, {CTRY_BELIZE, ETSI8_WORLD, "BZ", 40, 160, 0}, {CTRY_BERMUDA, FCC3_FCCA, "BM", 40, 160, 0}, @@ -875,7 +875,7 @@ const struct country_code_to_reg_domain g_all_countries[] = { {CTRY_QATAR, ETSI14_WORLD, "QA", 40, 160, 0}, {CTRY_REUNION, ETSI1_WORLD, "RE", 40, 160, 0}, {CTRY_ROMANIA, ETSI13_WORLD, "RO", 40, 160, 0}, - {CTRY_RUSSIA, ETSI8_WORLD, "RU", 40, 160, 0}, + {CTRY_RUSSIA, ETSI8_WORLD, "RU", 40, 160, REGULATORY_PHYMODE_NO11AX}, {CTRY_RWANDA, FCC3_WORLD, "RW", 40, 160, 0}, {CTRY_SAINT_BARTHELEMY, ETSI1_WORLD, "BL", 40, 160, 0}, {CTRY_SAINT_HELENA_ASCENSION_AND_TRISTAN_DA_CUNHA, ETSI13_WORLD, "SH", @@ -912,7 +912,7 @@ const struct country_code_to_reg_domain g_all_countries[] = { {CTRY_TURKEY, ETSI13_WORLD, "TR", 40, 160, 0}, {CTRY_TURKS_AND_CAICOS, FCC3_WORLD, "TC", 40, 160, 0}, {CTRY_UGANDA, FCC3_WORLD, "UG", 40, 160, 0}, - {CTRY_UKRAINE, ETSI9_WORLD, "UA", 40, 160, 0}, + {CTRY_UKRAINE, ETSI9_WORLD, "UA", 40, 160, REGULATORY_PHYMODE_NO11AX}, {CTRY_UAE, FCC3_WORLD, "AE", 40, 160, 0}, {CTRY_UNITED_KINGDOM, ETSI13_WORLD, "GB", 40, 160, 0}, {CTRY_UNITED_STATES, FCC3_FCCA, "US", 40, 160, 0},