qcacld-3.0: Process country and TPE IE for connection mgr

Change I57acca2257a263225d9bafb0f94e195a99224a60 and
I7d247ae9fc83d7b578b01ec664247c807f7834fc add code in the non
connection manaeger part of the code which is not used now.

Thus move the logic in LIM for connection manager.

Change-Id: Iaa7c31ca9deb3dae9af1aa0161f0177b1b6d9f93
CRs-Fixed: 2939766

core/mac/inc/sir_api.h

@@ -1055,9 +1055,6 @@ struct join_req {
 #endif
 	struct supported_channels supportedChannels;
 	bool force_rsne_override;
-	bool same_ctry_code;  /* If AP Country IE has same country code as */
-	/* STA programmed country */
-	uint8_t ap_power_type_6g;  /* AP power type for 6G (LPI, SP, or VLP) */
 	/* Pls make this as last variable in struct */
 	struct bss_description bssDescription;
 	/*

core/mac/src/pe/include/lim_session.h

@@ -578,7 +578,9 @@ struct pe_session {
 	uint32_t dfs_regdomain;
 	/* AP power type */
 	uint8_t ap_power_type;
-
+	bool same_ctry_code;  /* If AP Country IE has same country code as */
+	/* STA programmed country */
+	uint8_t ap_power_type_6g;  /* AP power type for 6G (LPI, SP, or VLP) */
 #ifdef WLAN_FEATURE_11BE
 	bool eht_capable;
 	tDot11fIEeht_cap eht_config;

core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -2624,6 +2624,37 @@ static void lim_get_basic_rates(tSirMacRateSet *b_rates, uint32_t chan_freq)
 		wlan_populate_basic_rates(b_rates, true, true);
 }
 
+/*
+ * lim_iterate_triplets() - Iterate the country IE to validate it
+ * @country_ie: country IE to iterate through
+ *
+ * This function always returns success because connection should not be failed
+ * in the case of missing elements in the country IE
+ *
+ * Return: QDF_STATUS
+ */
+static QDF_STATUS lim_iterate_triplets(tDot11fIECountry country_ie)
+{
+	u_int8_t i;
+
+	if (country_ie.first_triplet[0] > OP_CLASS_ID_200) {
+		if (country_ie.more_triplets[0][0] <= OP_CLASS_ID_200)
+			return QDF_STATUS_SUCCESS;
+	}
+
+	for (i = 0; i < country_ie.num_more_triplets; i++) {
+		if ((country_ie.more_triplets[i][0] > OP_CLASS_ID_200) &&
+		    (i < country_ie.num_more_triplets - 1)) {
+			if (country_ie.more_triplets[i + 1][0] <=
+			    OP_CLASS_ID_200)
+				return QDF_STATUS_SUCCESS;
+		}
+	}
+	pe_debug("No operating class triplet followed by sub-band triplet");
+
+	return QDF_STATUS_SUCCESS;
+}
+
 static QDF_STATUS
 lim_fill_pe_session(struct mac_context *mac_ctx, struct pe_session *session,
 		    struct bss_description *bss_desc)
@@ -2647,6 +2678,7 @@ lim_fill_pe_session(struct mac_context *mac_ctx, struct pe_session *session,
 	struct ps_params *ps_param =
 				&ps_global_info->ps_params[session->vdev_id];
 	uint32_t join_timeout;
+	uint8_t programmed_country[REG_ALPHA2_LEN + 1];
 
 	/*
 	 * Update the capability here itself as this is used in
@@ -2719,6 +2751,41 @@ lim_fill_pe_session(struct mac_context *mac_ctx, struct pe_session *session,
 		return QDF_STATUS_E_FAILURE;
 	}
 
+	if (wlan_reg_is_6ghz_chan_freq(bss_desc->chan_freq)) {
+		if (!ie_struct->Country.present)
+			pe_debug("Channel is 6G but country IE not present");
+		wlan_reg_read_current_country(mac_ctx->psoc,
+					      programmed_country);
+		if (qdf_mem_cmp(ie_struct->Country.country, programmed_country,
+				REG_ALPHA2_LEN)) {
+			pe_debug("Country IE:%c%c, STA country:%c%c",
+				  ie_struct->Country.country[0],
+				  ie_struct->Country.country[1],
+				  programmed_country[0],
+				  programmed_country[1]);
+			session->same_ctry_code = false;
+			if (wlan_reg_is_us(programmed_country)) {
+				pe_err("US VLP not in place yet, connection not allowed");
+				qdf_mem_free(ie_struct);
+				return QDF_STATUS_E_NOSUPPORT;
+			}
+			if (wlan_reg_is_etsi(programmed_country)) {
+				pe_debug("STA ctry:%c%c, doesn't match with AP ctry, switch to VLP",
+					  programmed_country[0],
+					  programmed_country[1]);
+				session->ap_power_type_6g =
+							REG_VERY_LOW_POWER_AP;
+			}
+		} else {
+			session->same_ctry_code = true;
+		}
+		lim_iterate_triplets(ie_struct->Country);
+
+		if (!ie_struct->num_transmit_power_env ||
+		    !ie_struct->transmit_power_env[0].present)
+			pe_debug("TPE not present for 6G channel");
+	}
+
 	/*
 	 * Join timeout: if we find a BeaconInterval in the BssDescription,
 	 * then set the Join Timeout to be 10 x the BeaconInterval.
@@ -4381,11 +4448,10 @@ void lim_calculate_tpc(struct mac_context *mac,
 		is_6ghz_freq = true;
 		is_psd_power = wlan_reg_is_6g_psd_power(mac->pdev);
 		if (LIM_IS_STA_ROLE(session)) {
-			if (session->lim_join_req->same_ctry_code)
+			if (session->same_ctry_code)
 				ap_power_type_6g = session->ap_power_type;
 			else
-				ap_power_type_6g =
-					session->lim_join_req->ap_power_type_6g;
+				ap_power_type_6g = session->ap_power_type_6g;
 		}
 	}
 

core/sme/src/csr/csr_api_roam.c

@@ -12990,36 +12990,6 @@ rel_vdev_ref:
 	return status;
 }
 
-/*
- * csr_iterate_triplets() - Iterate the country IE to validate it
- * @country_ie: country IE to iterate through
- *
- * This function always returns success because connection should not be failed
- * in the case of missing elements in the country IE
- *
- * Return: QDF_STATUS
- */
-static QDF_STATUS csr_iterate_triplets(tDot11fIECountry country_ie)
-{
-	u_int8_t i;
-
-	if (country_ie.first_triplet[0] > OP_CLASS_ID_200) {
-		if (country_ie.more_triplets[0][0] <= OP_CLASS_ID_200)
-			return QDF_STATUS_SUCCESS;
-	}
-
-	for (i = 0; i < country_ie.num_more_triplets; i++) {
-		if ((country_ie.more_triplets[i][0] > OP_CLASS_ID_200) &&
-		    (i < country_ie.num_more_triplets - 1)) {
-			if (country_ie.more_triplets[i + 1][0] <=
-			    OP_CLASS_ID_200)
-				return QDF_STATUS_SUCCESS;
-		}
-	}
-	sme_debug("No operating class triplet followed by sub-band triplet");
-	return QDF_STATUS_SUCCESS;
-}
-
 /**
  * The communication between HDD and LIM is thru mailbox (MB).
  * Both sides will access the data structure "struct join_req".
@@ -13045,7 +13015,6 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId,
 	struct join_req *csr_join_req;
 	tpCsrNeighborRoamControlInfo neigh_roam_info;
 	enum csr_akm_type akm;
-	uint8_t programmed_country[REG_ALPHA2_LEN + 1];
 #ifdef FEATURE_WLAN_ESE
 	bool ese_config = false;
 #endif
@@ -13358,45 +13327,6 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId,
 			}
 		}
 #endif /* FEATURE_WLAN_ESE */
-
-		if (wlan_reg_is_6ghz_chan_freq(pBssDescription->chan_freq)) {
-			if (!pIes->Country.present)
-				sme_debug("Channel is 6G but country IE not present");
-			wlan_reg_read_current_country(mac->psoc,
-						      programmed_country);
-			if (qdf_mem_cmp(pIes->Country.country,
-					programmed_country,
-					REG_ALPHA2_LEN)) {
-				sme_debug("Country IE:%c%c, STA country:%c%c",
-					  pIes->Country.country[0],
-					  pIes->Country.country[1],
-					  programmed_country[0],
-					  programmed_country[1]);
-				csr_join_req->same_ctry_code = false;
-				if (wlan_reg_is_us(programmed_country)) {
-					sme_err("US VLP not in place yet, connection not allowed");
-					status = QDF_STATUS_E_NOSUPPORT;
-					return status;
-				}
-				if (wlan_reg_is_etsi(programmed_country)) {
-					sme_debug("STA ctry:%c%c, doesn't match with AP ctry, switch to VLP",
-						  programmed_country[0],
-						  programmed_country[1]);
-					csr_join_req->ap_power_type_6g =
-							REG_VERY_LOW_POWER_AP;
-				}
-			} else {
-				csr_join_req->same_ctry_code = true;
-			}
-			status = csr_iterate_triplets(pIes->Country);
-		}
-
-		if (wlan_reg_is_6ghz_chan_freq(pBssDescription->chan_freq)) {
-			if (!pIes->num_transmit_power_env ||
-			    !pIes->transmit_power_env[0].present)
-				sme_debug("TPE not present for 6G channel");
-		}
-
 		if (pProfile->bOSENAssociation)
 			csr_join_req->isOSENConnection = true;
 		else