qcacmn: Use the operating class table no for AP's country IE for RRM

Currently when an RRM scan is issued for beacon report request from the
connected AP, we use the current scan country code to get the op class
table for the country.
However, the AP can specify which table to use in the country IE's 3rd
byte of the country field which is not parsed and stored in the scan
country code.
For RRM Scan for beacon report request, use the 3rd byte to get the table
number from the connected AP's beacon and if no table number is present,
then use the op class table based on the country code.

Change-Id: I0911ac908d1c71676f7c1450ab260eaa732ddcb9
CRs-Fixed: 2432662

umac/regulatory/core/src/reg_opclass.c

@@ -123,20 +123,58 @@ static const struct reg_dmn_op_class_map_t japan_op_class[] = {
 };
 
 #ifdef HOST_OPCLASS
-uint16_t reg_dmn_get_chanwidth_from_opclass(uint8_t *country, uint8_t channel,
-					    uint8_t opclass)
+/**
+ * reg_get_class_from_country()- Get Class from country
+ * @country- Country
+ *
+ * Return: class.
+ */
+static
+const struct reg_dmn_op_class_map_t *reg_get_class_from_country(uint8_t
+								   *country)
 {
-	const struct reg_dmn_op_class_map_t *class;
-	uint16_t i;
+	const struct reg_dmn_op_class_map_t *class = NULL;
 
-	if (!qdf_mem_cmp(country, "US", 2))
+	qdf_debug("Country %c%c 0x%x",
+		  country[0], country[1], country[2]);
+
+	switch (country[2]) {
+	case OP_CLASS_US:
 		class = us_op_class;
-	else if (!qdf_mem_cmp(country, "EU", 2))
+		break;
+
+	case OP_CLASS_EU:
 		class = euro_op_class;
-	else if (!qdf_mem_cmp(country, "JP", 2))
+		break;
+
+	case OP_CLASS_JAPAN:
 		class = japan_op_class;
-	else
+		break;
+
+	case OP_CLASS_GLOBAL:
 		class = global_op_class;
+		break;
+
+	default:
+		if (!qdf_mem_cmp(country, "US", 2))
+			class = us_op_class;
+		else if (!qdf_mem_cmp(country, "EU", 2))
+			class = euro_op_class;
+		else if (!qdf_mem_cmp(country, "JP", 2))
+			class = japan_op_class;
+		else
+			class = global_op_class;
+	}
+	return class;
+}
+
+uint16_t reg_dmn_get_chanwidth_from_opclass(uint8_t *country, uint8_t channel,
+					    uint8_t opclass)
+{
+	const struct reg_dmn_op_class_map_t *class;
+	uint16_t i;
+
+	class = reg_get_class_from_country(country);
 
 	while (class->op_class) {
 		if (opclass == class->op_class) {
@@ -158,16 +196,8 @@ uint16_t reg_dmn_get_opclass_from_channel(uint8_t *country, uint8_t channel,
 	const struct reg_dmn_op_class_map_t *class = NULL;
 	uint16_t i = 0;
 
-	if (!qdf_mem_cmp(country, "US", 2))
-		class = us_op_class;
-	else if (!qdf_mem_cmp(country, "EU", 2))
-		class = euro_op_class;
-	else if (!qdf_mem_cmp(country, "JP", 2))
-		class = japan_op_class;
-	else
-		class = global_op_class;
-
-	while (class->op_class) {
+	class = reg_get_class_from_country(country);
+	while (class && class->op_class) {
 		if ((offset == class->offset) || (offset == BWALL)) {
 			for (i = 0; (i < REG_MAX_CHANNELS_PER_OPERATING_CLASS &&
 				     class->channels[i]); i++) {
@@ -181,6 +211,29 @@ uint16_t reg_dmn_get_opclass_from_channel(uint8_t *country, uint8_t channel,
 	return 0;
 }
 
+void reg_dmn_print_channels_in_opclass(uint8_t *country, uint8_t op_class)
+{
+	const struct reg_dmn_op_class_map_t *class = NULL;
+	uint16_t i = 0;
+
+	class = reg_get_class_from_country(country);
+	while (class && class->op_class) {
+		if (class->op_class == op_class) {
+			for (i = 0;
+			     (i < REG_MAX_CHANNELS_PER_OPERATING_CLASS &&
+			      class->channels[i]); i++) {
+				reg_debug("Valid channel(%d) in requested RC(%d)",
+					  class->channels[i], op_class);
+			}
+			break;
+		}
+		class++;
+	}
+	if (!class->op_class)
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
+			  "Invalid requested RC (%d)", op_class);
+}
+
 uint16_t reg_dmn_set_curr_opclasses(uint8_t num_classes, uint8_t *class)
 {
 	uint8_t i;

umac/regulatory/core/src/reg_opclass.h

@@ -47,6 +47,14 @@ uint16_t reg_dmn_get_chanwidth_from_opclass(uint8_t *country, uint8_t channel,
  */
 uint16_t reg_dmn_get_opclass_from_channel(uint8_t *country, uint8_t channel,
 					  uint8_t offset);
+/**
+ * reg_dmn_get_opclass_from_channe() - Print channels in op class.
+ * @country: Country code.
+ * @opclass: opclass.
+ *
+ * Return: Void.
+ */
+void reg_dmn_print_channels_in_opclass(uint8_t *country, uint8_t op_class);
 
 /**
  * reg_dmn_set_curr_opclasses() - Set current operating class
@@ -91,5 +99,11 @@ static inline uint16_t reg_dmn_get_opclass_from_channel(
 {
 	return 0;
 }
+
+static inline void reg_dmn_print_channels_in_opclass(uint8_t *country,
+						     uint8_t op_class)
+{
+}
+
 #endif
 #endif

umac/regulatory/dispatcher/inc/reg_services_public_struct.h

@@ -74,6 +74,18 @@ enum dfs_reg {
 	DFS_UNDEF_REGION = 0xFFFF,
 };
 
+/** enum op_class_table_num
+ * OP_CLASS_US- Class corresponds to US
+ * OP_CLASS_EU- Class corresponds to EU
+ * OP_CLASS_JAPAN- Class corresponds to JAPAN
+ * OP_CLASS_GLOBAL- Class corresponds to GLOBAL
+ */
+enum op_class_table_num {
+	OP_CLASS_US = 1,
+	OP_CLASS_EU,
+	OP_CLASS_JAPAN,
+	OP_CLASS_GLOBAL
+};
 #ifdef CONFIG_LEGACY_CHAN_ENUM
 
 /**

umac/regulatory/dispatcher/inc/wlan_reg_services_api.h

@@ -391,6 +391,16 @@ QDF_STATUS wlan_reg_get_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr,
 uint16_t wlan_reg_dmn_get_opclass_from_channel(uint8_t *country,
 					       uint8_t channel,
 					       uint8_t offset);
+/**
+ * wlan_reg_dmn_print_channels_in_opclass() - Print channels in op-class
+ * @country: country alpha2
+ * @opclass: oplcass
+ *
+ * Return: void
+ */
+void wlan_reg_dmn_print_channels_in_opclass(uint8_t *country,
+					    uint8_t opclass);
+
 
 /**
  * wlan_reg_dmn_get_chanwidth_from_opclass() - get channel width from

umac/regulatory/dispatcher/src/wlan_reg_services_api.c

@@ -254,6 +254,12 @@ uint16_t wlan_reg_dmn_get_opclass_from_channel(uint8_t *country,
 						offset);
 }
 
+void wlan_reg_dmn_print_channels_in_opclass(uint8_t *country,
+					    uint8_t opclass)
+{
+	reg_dmn_print_channels_in_opclass(country, opclass);
+}
+
 uint16_t wlan_reg_dmn_get_chanwidth_from_opclass(uint8_t *country,
 						 uint8_t channel,
 						 uint8_t opclass)