qcacld-3.0: Handle invalid 6 GHz power type advertised by AP

If AP doesn't advertise 6 GHz power type or advertises
invalid 6 GHz power type, find the power type for connection
as per below logic.
a) Connect in VLP only if VLP power type is available for STA
   for the connection channel.
b) Otherwise connect in LPI only if LPI power type is available
   for STA for the connection channel for STA.
Don't connect if VLP or LPI power types are not available for
STA for the connection channel.

Change-Id: I3bcf1e8758042cc00f5f4be1a3fd0bbfe74d1677
CRs-Fixed: 3537387

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

@@ -2682,24 +2682,6 @@ static inline void lim_fill_rssi(struct pe_session *session,
 }
 #endif
 
-static QDF_STATUS lim_check_and_validate_6g_ap(struct mac_context *mac_ctx,
-					       struct bss_description *bss,
-					       tDot11fBeaconIEs *ie)
-{
-	tDot11fIEhe_op *he_op = &ie->he_op;
-
-	if (!wlan_reg_is_6ghz_chan_freq(bss->chan_freq))
-		return QDF_STATUS_SUCCESS;
-
-	if (!he_op->oper_info_6g_present) {
-		pe_err(QDF_MAC_ADDR_FMT" Invalid 6GHZ AP BSS description IE",
-			QDF_MAC_ADDR_REF(bss->bssId));
-		return QDF_STATUS_E_INVAL;
-	}
-
-	return QDF_STATUS_SUCCESS;
-}
-
 #if defined(WLAN_SAE_SINGLE_PMK) && defined(WLAN_FEATURE_ROAM_OFFLOAD)
 /**
  * lim_update_sae_single_pmk_ap_cap() - Function to update sae single pmk ap ie
@@ -3062,12 +3044,6 @@ lim_fill_pe_session(struct mac_context *mac_ctx, struct pe_session *session,
 		mac_ctx->mlme_cfg->feature_flags.enable_short_slot_time_11g =
 			mac_ctx->mlme_cfg->ht_caps.short_slot_time_enabled;
 
-	status = lim_check_and_validate_6g_ap(mac_ctx, bss_desc, ie_struct);
-	if (QDF_IS_STATUS_ERROR(status)) {
-		status = QDF_STATUS_E_FAILURE;
-		goto send;
-	}
-
 	/*
 	 * Join timeout: if we find a BeaconInterval in the BssDescription,
 	 * then set the Join Timeout to be 10 x the BeaconInterval.

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

@@ -122,7 +122,7 @@ static void lim_extract_he_op(struct pe_session *session,
 		return;
 	if (!session->he_op.oper_info_6g_present) {
 		pe_debug("6GHz op not present in 6G beacon");
-		session->ap_defined_power_type_6g = REG_VERY_LOW_POWER_AP;
+		session->ap_defined_power_type_6g = REG_CURRENT_MAX_AP_TYPE;
 		return;
 	}
 	session->ch_width = session->he_op.oper_info_6g.info.ch_width;
@@ -134,8 +134,8 @@ static void lim_extract_he_op(struct pe_session *session,
 		session->he_op.oper_info_6g.info.reg_info;
 	if (session->ap_defined_power_type_6g < REG_INDOOR_AP ||
 	    session->ap_defined_power_type_6g > REG_MAX_SUPP_AP_TYPE) {
-		session->ap_defined_power_type_6g = REG_VERY_LOW_POWER_AP;
-		pe_debug("AP power type invalid, defaulting to VLP");
+		session->ap_defined_power_type_6g = REG_CURRENT_MAX_AP_TYPE;
+		pe_debug("AP power type invalid, defaulting to MAX_AP_TYPE");
 	}
 
 	pe_debug("6G op info: ch_wd %d cntr_freq_seg0 %d cntr_freq_seg1 %d",

core/mac/src/pe/sch/sch_beacon_process.c

@@ -740,13 +740,13 @@ static void __sch_beacon_process_for_session(struct mac_context *mac_ctx,
 			    session->ap_defined_power_type_6g >
 			    REG_MAX_SUPP_AP_TYPE) {
 				session->ap_defined_power_type_6g =
-							 REG_VERY_LOW_POWER_AP;
-				pe_debug("AP power type is invalid, defaulting to VLP");
+						REG_CURRENT_MAX_AP_TYPE;
+				pe_debug("AP power type is invalid, defaulting to MAX_AP_TYPE");
 			}
 		} else {
-			pe_debug("AP power type is null, defaulting to VLP");
+			pe_debug("AP power type is null, defaulting to MAX_AP_TYPE");
 			session->ap_defined_power_type_6g =
-							REG_VERY_LOW_POWER_AP;
+						REG_CURRENT_MAX_AP_TYPE;
 		}
 
 		status = wlan_reg_get_best_6g_power_type(