Bläddra i källkod

qcacmn: Add API get Regdomain ID

API is added to get Regdomain ID from Regdb component.

Change-Id: I78424fa4b608d00cb44033a5860403b19da0b9c8
CRs-Fixed: 2002892
Baila, Shashikala Prabhu 8 år sedan
förälder
incheckning
0e5c6c7ec7
2 ändrade filer med 14 tillägg och 12 borttagningar
  1. 12 12
      umac/regulatory/core/src/reg_db.c
  2. 2 0
      umac/regulatory/core/src/reg_services.c

+ 12 - 12
umac/regulatory/core/src/reg_db.c

@@ -623,18 +623,18 @@ const struct reg_domain_pair g_reg_dmn_pairs[] = {
 	{MKK11_FCCA, MKK11, FCCA},
 	{MKK11_MKKC, MKK11, MKKC},
 
-	{WORLD_60, WORLD_2G_3, WORLD_5G_2},
-	{WORLD_61, WORLD_2G_3, WORLD_5G_2},
-	{WORLD_62, WORLD_2G_3, WORLD_5G_2},
-	{WORLD_63, WORLD_2G_2, WORLD_5G_1},
-	{WORLD_65, WORLD_2G_2, WORLD_5G_1},
-	{WORLD_64, WORLD_2G_1, WORLD_5G_1},
-	{WORLD_66, WORLD_2G_1, WORLD_5G_2},
-	{WORLD_69, WORLD_2G_1, WORLD_5G_2},
-	{WORLD_67, WORLD_2G_2, WORLD_5G_2},
-	{WORLD_68, WORLD_2G_2, WORLD_5G_2},
-	{WORLD_6A, WORLD_2G_2, WORLD_5G_2},
-	{WORLD_6C, WORLD_2G_2, WORLD_5G_2},
+	{WORLD_60, WORLD_5G_2, WORLD_2G_3},
+	{WORLD_61, WORLD_5G_2, WORLD_2G_3},
+	{WORLD_62, WORLD_5G_2, WORLD_2G_3},
+	{WORLD_63, WORLD_5G_1, WORLD_2G_2},
+	{WORLD_65, WORLD_5G_1, WORLD_2G_2},
+	{WORLD_64, WORLD_5G_1, WORLD_2G_1},
+	{WORLD_66, WORLD_5G_2, WORLD_2G_1},
+	{WORLD_69, WORLD_5G_2, WORLD_2G_1},
+	{WORLD_67, WORLD_5G_2, WORLD_2G_2},
+	{WORLD_68, WORLD_5G_2, WORLD_2G_2},
+	{WORLD_6A, WORLD_5G_2, WORLD_2G_2},
+	{WORLD_6C, WORLD_5G_2, WORLD_2G_2},
 };
 
 enum reg_rules_2g {

+ 2 - 0
umac/regulatory/core/src/reg_services.c

@@ -2187,6 +2187,8 @@ QDF_STATUS reg_get_current_cc(struct wlan_objmgr_psoc *psoc,
 	} else if (rd->flags == ALPHA_IS_SET) {
 		qdf_mem_copy(rd->cc.alpha, soc_reg->current_country,
 				sizeof(rd->cc.alpha));
+	} else if (rd->flags == REGDMN_IS_SET) {
+		rd->cc.regdmn_id = soc_reg->reg_dmn_pair;
 	}
 
 	return QDF_STATUS_SUCCESS;