From f4dc3785e963cc7e170d6842a0cc2b44cf0fe4b4 Mon Sep 17 00:00:00 2001 From: Abhijit Pradhan Date: Tue, 11 Jul 2017 16:28:59 +0530 Subject: [PATCH] qcacmn: Regulatory Updates Regulatory spec changes(Regdomain_23). Removed below country codes from the regulatory database. * IRAN * KOREA NORTH * SYRIA Change-Id: Ieedfe73d0b6c2192027038f63f6ca4369666cf2a CRs-Fixed: 2074470 --- umac/regulatory/core/src/reg_db.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/umac/regulatory/core/src/reg_db.c b/umac/regulatory/core/src/reg_db.c index f88139d5b6f8..ca72cd0e9a0b 100644 --- a/umac/regulatory/core/src/reg_db.c +++ b/umac/regulatory/core/src/reg_db.c @@ -100,7 +100,6 @@ enum country_code { CTRY_ICELAND = 352, CTRY_INDIA = 356, CTRY_INDONESIA = 360, - CTRY_IRAN = 364, CTRY_IRELAND = 372, CTRY_ISRAEL = 376, CTRY_ITALY = 380, @@ -108,7 +107,6 @@ enum country_code { CTRY_JORDAN = 400, CTRY_KAZAKHSTAN = 398, CTRY_KENYA = 404, - CTRY_KOREA_NORTH = 408, CTRY_KOREA_ROC = 410, CTRY_KUWAIT = 414, CTRY_LATVIA = 428, @@ -179,7 +177,6 @@ enum country_code { CTRY_SRI_LANKA = 144, CTRY_SWEDEN = 752, CTRY_SWITZERLAND = 756, - CTRY_SYRIA = 760, CTRY_TAIWAN = 158, CTRY_TANZANIA = 834, CTRY_THAILAND = 764, @@ -387,7 +384,6 @@ const struct country_code_to_reg_domain g_all_countries[] = { {CTRY_ICELAND, ETSI1_WORLD, "IS", "IS" , 40, 160, 0}, {CTRY_INDIA, APL15_WORLD, "IN", "IN", 40, 160, 0}, {CTRY_INDONESIA, APL2_ETSIC, "ID", "ID", 40, 20, 0}, - {CTRY_IRAN, APL1_WORLD, "IR", "IR", 40, 160, 0}, {CTRY_IRELAND, ETSI1_WORLD, "IE", "IE", 40, 160, 0}, {CTRY_ISRAEL, ETSI3_WORLD, "IL", "IL", 40, 160, 0}, {CTRY_ITALY, ETSI1_WORLD, "IT", "IT", 40, 160, 0}, @@ -395,7 +391,6 @@ const struct country_code_to_reg_domain g_all_countries[] = { {CTRY_JORDAN, APL4_WORLD, "JO", "JO", 40, 160, 0}, {CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", "KZ", 40, 0, 0}, {CTRY_KENYA, APL12_WORLD, "KE", "KE", 40, 160, 0}, - {CTRY_KOREA_NORTH, APL9_WORLD, "KP", "KP", 20, 20, 0}, {CTRY_KOREA_ROC, APL9_WORLD, "KR", "KR", 40, 160, 0}, {CTRY_KUWAIT, ETSI3_WORLD, "KW", "KW", 40, 160, 0}, {CTRY_LATVIA, ETSI1_WORLD, "LV", "LV", 40, 160, 0}, @@ -467,7 +462,6 @@ const struct country_code_to_reg_domain g_all_countries[] = { {CTRY_SRI_LANKA, FCC3_WORLD, "LK", "LK", 40, 20, 0}, {CTRY_SWEDEN, ETSI1_WORLD, "SE", "SE", 40, 160, 0}, {CTRY_SWITZERLAND, ETSI1_WORLD, "CH", "CH", 40, 160, 0}, - {CTRY_SYRIA, NULL1_WORLD, "SY", "SY", 40, 0, 0}, {CTRY_TAIWAN, FCC3_FCCA, "TW", "TW", 40, 160, 0}, {CTRY_TANZANIA, APL1_WORLD, "TZ", "TZ", 40, 160, 0}, {CTRY_THAILAND, FCC3_WORLD, "TH", "TH", 40, 160, 0},