qcacld-3.0: Remove smps params in pe_session

Currently smps params are stored to pe session and read from it.
Fix is to directly read from mlme cfg and remove pe session params.

Change-Id: I0edd568e505ef80e8e9ef1b8f1938fd01812cb28
CRs-Fixed: 3449560

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

@@ -516,8 +516,6 @@ struct wlan_mlo_ie_info {
  * @enableVhtGid:
  * @gLimWiderBWChannelSwitch:
  * @enableAmpduPs:
- * @enableHtSmps:
- * @htSmpsvalue:
  * @send_smps_action:
  * @spectrumMgtEnabled:
  * @gLimSpecMgmt:
@@ -832,8 +830,6 @@ struct pe_session {
 	uint8_t enableVhtGid;
 	tLimWiderBWChannelSwitchInfo gLimWiderBWChannelSwitch;
 	uint8_t enableAmpduPs;
-	uint8_t enableHtSmps;
-	uint8_t htSmpsvalue;
 	bool send_smps_action;
 	uint8_t spectrumMgtEnabled;
 

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

@@ -2945,9 +2945,9 @@ lim_add_sta_self(struct mac_context *mac, uint8_t updateSta,
 				pe_session->vht_config.mu_beam_formee;
 	pAddStaParams->enableVhtpAid = pe_session->enableVhtpAid;
 	pAddStaParams->enableAmpduPs = pe_session->enableAmpduPs;
-	pAddStaParams->enableHtSmps = (pe_session->enableHtSmps &&
+	pAddStaParams->enableHtSmps = (mac->mlme_cfg->ht_caps.enable_smps &&
 				(!pe_session->supported_nss_1x1));
-	pAddStaParams->htSmpsconfig = pe_session->htSmpsvalue;
+	pAddStaParams->htSmpsconfig = mac->mlme_cfg->ht_caps.smps;
 	pAddStaParams->send_smps_action =
 		pe_session->send_smps_action;
 

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

@@ -757,8 +757,6 @@ void lim_fill_ft_session(struct mac_context *mac,
 	/* Load default OBSS parameters to session entry */
 	lim_init_obss_params(mac, ft_session);
 
-	ft_session->enableHtSmps = pe_session->enableHtSmps;
-	ft_session->htSmpsvalue = pe_session->htSmpsvalue;
 	/*
 	 * By default supported NSS 1x1 is set to true
 	 * and later on updated while determining session
@@ -767,8 +765,8 @@ void lim_fill_ft_session(struct mac_context *mac,
 	 */
 	ft_session->supported_nss_1x1 = true;
 	pe_debug("FT enable smps: %d mode: %d supported nss 1x1: %d",
-		ft_session->enableHtSmps,
-		ft_session->htSmpsvalue,
+		mac->mlme_cfg->ht_caps.enable_smps,
+		mac->mlme_cfg->ht_caps.smps,
 		ft_session->supported_nss_1x1);
 
 	qdf_mem_free(pBeaconStruct);

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

@@ -3161,8 +3161,6 @@ lim_fill_pe_session(struct mac_context *mac_ctx, struct pe_session *session,
 	session->nwType = bss_desc->nwType;
 	session->enableAmpduPs =
 		mac_ctx->mlme_cfg->ht_caps.enable_ampdu_ps;
-	session->enableHtSmps = mac_ctx->mlme_cfg->ht_caps.enable_smps;
-	session->htSmpsvalue = mac_ctx->mlme_cfg->ht_caps.smps;
 	session->send_smps_action =
 		mac_ctx->roam.configParam.send_smps_action;
 	session->vhtCapability =
@@ -4342,7 +4340,8 @@ lim_cm_handle_join_req(struct cm_vdev_join_req *req)
 		 pe_session->curr_op_freq, pe_session->ch_width,
 		 pe_session->ch_center_freq_seg0,
 		 pe_session->ch_center_freq_seg1,
-		 pe_session->enableHtSmps, pe_session->htSmpsvalue,
+		 mac_ctx->mlme_cfg->ht_caps.enable_smps,
+		 mac_ctx->mlme_cfg->ht_caps.smps,
 		 pe_session->send_smps_action, pe_session->supported_nss_1x1,
 		 pe_session->vdev_nss, pe_session->nss,
 		 pe_session->htSupportedChannelWidthSet,
@@ -4872,13 +4871,11 @@ static void lim_handle_reassoc_req(struct cm_vdev_join_req *req)
 		session_entry->vht_config.su_beam_formee,
 		session_entry->vht_config.su_beam_former);
 
-	session_entry->enableHtSmps = mac_ctx->mlme_cfg->ht_caps.enable_smps;
-	session_entry->htSmpsvalue = mac_ctx->mlme_cfg->ht_caps.smps;
 	session_entry->send_smps_action =
 		mac_ctx->roam.configParam.send_smps_action;
 	pe_debug("enableHtSmps: %d htSmps: %d send action: %d supported nss 1x1: %d",
-		session_entry->enableHtSmps,
-		session_entry->htSmpsvalue,
+		mac_ctx->mlme_cfg->ht_caps.enable_smps,
+		mac_ctx->mlme_cfg->ht_caps.smps,
 		session_entry->send_smps_action,
 		session_entry->supported_nss_1x1);
 	session_entry->lim_join_req = NULL;

core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -1092,11 +1092,11 @@ populate_dot11f_ht_caps(struct mac_context *mac,
 	 */
 	if (pe_session &&
 	    LIM_IS_STA_ROLE(pe_session) &&
-	    (pe_session->enableHtSmps) &&
+	    (mac->mlme_cfg->ht_caps.enable_smps) &&
 	    (!pe_session->supported_nss_1x1)) {
 		pe_debug("Add SM power save IE: %d",
-			pe_session->htSmpsvalue);
-		pDot11f->mimoPowerSave = pe_session->htSmpsvalue;
+			 mac->mlme_cfg->ht_caps.smps);
+		pDot11f->mimoPowerSave = mac->mlme_cfg->ht_caps.smps;
 	}
 
 	pDot11f->pco = mac->mlme_cfg->ht_caps.ext_cap_info.pco;