qcacld-3.0: Correctly call sme cfg APIs

The sme cfg APIs sme_cfg_get_int(), sme_cfg_set_int(),
sme_cfg_get_str(), and sme_cfg_set_str() all take a mac_handle_t (aka
tHalHandle) as the first parameter. However in some cases the caller
is actually passing a tpAniSirGlobal. Even though these ultimately
reference the same structure, an upcoming change will enforce type
safety so update the bad callers to pass a parameter of the correct
type.

Change-Id: I7f602c2c6c25f15efe239cb1ba2c0c8e5bfd3e0a
CRs-Fixed: 2268811

core/sme/src/common/sme_api.c

@@ -12752,7 +12752,7 @@ QDF_STATUS sme_update_nss(tHalHandle h_hal, uint8_t nss)
 		mac_ctx->roam.configParam.enable2x2 = (nss == 1) ? 0 : 1;
 
 		/* get the HT capability info*/
-		sme_cfg_get_int(mac_ctx, WNI_CFG_HT_CAP_INFO, &value);
+		sme_cfg_get_int(h_hal, WNI_CFG_HT_CAP_INFO, &value);
 		uHTCapabilityInfo.cfg_value16 = (0xFFFF & value);
 
 		for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) {
@@ -12785,9 +12785,9 @@ void sme_update_user_configured_nss(tHalHandle hal, uint8_t nss)
 int sme_update_tx_bfee_supp(tHalHandle hal, uint8_t session_id,
 			    uint8_t cfg_val)
 {
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal);
-	QDF_STATUS status = QDF_STATUS_SUCCESS;
-	status = sme_cfg_set_int(mac_ctx, WNI_CFG_VHT_SU_BEAMFORMEE_CAP,
+	QDF_STATUS status;
+
+	status = sme_cfg_set_int(hal, WNI_CFG_VHT_SU_BEAMFORMEE_CAP,
 				 cfg_val);
 	if (status != QDF_STATUS_SUCCESS) {
 		sme_err("Failed to set SU BFEE CFG");
@@ -12822,8 +12822,8 @@ void sme_update_he_cap_nss(tHalHandle hal, uint8_t session_id,
 		sme_err("invalid Nss value %d", nss);
 	}
 	csr_session = CSR_GET_SESSION(mac_ctx, session_id);
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_RX_MCS_MAP_LT_80, &rx_mcs_map);
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_TX_MCS_MAP_LT_80, &tx_mcs_map);
+	sme_cfg_get_int(hal, WNI_CFG_HE_RX_MCS_MAP_LT_80, &rx_mcs_map);
+	sme_cfg_get_int(hal, WNI_CFG_HE_TX_MCS_MAP_LT_80, &tx_mcs_map);
 	if (nss == 1) {
 		tx_mcs_map = HE_SET_MCS_4_NSS(tx_mcs_map, HE_MCS_DISABLE, 2);
 		rx_mcs_map = HE_SET_MCS_4_NSS(rx_mcs_map, HE_MCS_DISABLE, 2);
@@ -12833,8 +12833,8 @@ void sme_update_he_cap_nss(tHalHandle hal, uint8_t session_id,
 	}
 	sme_info("new HE Nss MCS MAP: Rx 0x%0X, Tx: 0x%0X",
 			rx_mcs_map, tx_mcs_map);
-	sme_cfg_set_int(mac_ctx, WNI_CFG_HE_RX_MCS_MAP_LT_80, rx_mcs_map);
-	sme_cfg_set_int(mac_ctx, WNI_CFG_HE_TX_MCS_MAP_LT_80, tx_mcs_map);
+	sme_cfg_set_int(hal, WNI_CFG_HE_RX_MCS_MAP_LT_80, rx_mcs_map);
+	sme_cfg_set_int(hal, WNI_CFG_HE_TX_MCS_MAP_LT_80, tx_mcs_map);
 	csr_update_session_he_cap(mac_ctx, csr_session);
 
 }
@@ -12894,8 +12894,8 @@ int sme_update_he_mcs(tHalHandle hal, uint8_t session_id, uint16_t he_mcs)
 		return -EINVAL;
 	}
 	sme_info("new HE MCS 0x%0x", mcs_map);
-	sme_cfg_set_int(mac_ctx, wni_cfg_tx_param, mcs_map);
-	sme_cfg_set_int(mac_ctx, wni_cfg_rx_param, mcs_map);
+	sme_cfg_set_int(hal, wni_cfg_tx_param, mcs_map);
+	sme_cfg_set_int(hal, wni_cfg_rx_param, mcs_map);
 	csr_update_session_he_cap(mac_ctx, csr_session);
 
 	return 0;
@@ -12912,7 +12912,7 @@ static int sme_update_he_cap(tHalHandle hal, uint8_t session_id,
 		sme_err("No session for id %d", session_id);
 		return -EINVAL;
 	}
-	sme_cfg_set_int(mac_ctx, he_cap, value);
+	sme_cfg_set_int(hal, he_cap, value);
 	csr_update_session_he_cap(mac_ctx, session);
 
 	return 0;

core/sme/src/csr/csr_api_roam.c

@@ -2441,75 +2441,75 @@ static void csr_start_bss_copy_he_cap(tSirSmeStartBssReq *req,
 void csr_update_session_he_cap(tpAniSirGlobal mac_ctx,
 			struct csr_roam_session *session)
 {
+	mac_handle_t mac_hdl = MAC_HANDLE(mac_ctx);
 	uint32_t value = 0;
 	tDot11fIEhe_cap *he_cap = &session->he_config;
-
 	he_cap->present = true;
 
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_CONTROL, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_CONTROL, &value);
 	he_cap->htc_he = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_TWT_REQUESTOR, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_TWT_REQUESTOR, &value);
 	he_cap->twt_request = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_TWT_RESPONDER, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_TWT_RESPONDER, &value);
 	he_cap->twt_responder = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_FRAGMENTATION, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_FRAGMENTATION, &value);
 	he_cap->fragmentation = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_MAX_FRAG_MSDU, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_MAX_FRAG_MSDU, &value);
 	he_cap->max_num_frag_msdu = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_MIN_FRAG_SIZE, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_MIN_FRAG_SIZE, &value);
 	he_cap->min_frag_size = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_TRIG_PAD, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_TRIG_PAD, &value);
 	he_cap->trigger_frm_mac_pad = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_MTID_AGGR, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_MTID_AGGR, &value);
 	he_cap->multi_tid_aggr = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_LINK_ADAPTATION, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_LINK_ADAPTATION, &value);
 	he_cap->he_link_adaptation = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_ALL_ACK, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_ALL_ACK, &value);
 	he_cap->all_ack = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_UL_MU_RSP_SCHEDULING, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_UL_MU_RSP_SCHEDULING, &value);
 	he_cap->ul_mu_rsp_sched = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_BUFFER_STATUS_RPT, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_BUFFER_STATUS_RPT, &value);
 	he_cap->a_bsr = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_BCAST_TWT, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_BCAST_TWT, &value);
 	he_cap->broadcast_twt = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_BA_32BIT, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_BA_32BIT, &value);
 	he_cap->ba_32bit_bitmap = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_MU_CASCADING, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_MU_CASCADING, &value);
 	he_cap->mu_cascade = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_MULTI_TID, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_MULTI_TID, &value);
 	he_cap->ack_enabled_multitid = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_DL_MU_BA, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_DL_MU_BA, &value);
 	he_cap->dl_mu_ba = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_OMI, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_OMI, &value);
 	he_cap->omi_a_ctrl = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_OFDMA_RA, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_OFDMA_RA, &value);
 	he_cap->ofdma_ra = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_MAX_AMPDU_LEN, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_MAX_AMPDU_LEN, &value);
 	he_cap->max_ampdu_len = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_AMSDU_FRAG, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_AMSDU_FRAG, &value);
 	he_cap->amsdu_frag = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_FLEX_TWT_SCHED, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_FLEX_TWT_SCHED, &value);
 	he_cap->flex_twt_sched = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_RX_CTRL, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_RX_CTRL, &value);
 	he_cap->rx_ctrl_frame = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_BSRP_AMPDU_AGGR, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_BSRP_AMPDU_AGGR, &value);
 	he_cap->bsrp_ampdu_aggr = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_QTP, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_QTP, &value);
 	he_cap->qtp = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_A_BQR, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_A_BQR, &value);
 	he_cap->a_bqr = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_SR_RESPONDER, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_SR_RESPONDER, &value);
 	he_cap->sr_responder = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_NDP_FEEDBACK_SUPP, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_NDP_FEEDBACK_SUPP, &value);
 	he_cap->ndp_feedback_supp = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_OPS_SUPP, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_OPS_SUPP, &value);
 	he_cap->ops_supp = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_AMSDU_IN_AMPDU, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_AMSDU_IN_AMPDU, &value);
 	he_cap->amsdu_in_ampdu = value;
 
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_DUAL_BAND, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_DUAL_BAND, &value);
 	he_cap->dual_band = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_CHAN_WIDTH, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_CHAN_WIDTH, &value);
 	he_cap->chan_width_0 = HE_CH_WIDTH_GET_BIT(value, 0);
 	he_cap->chan_width_1 = HE_CH_WIDTH_GET_BIT(value, 1);
 	he_cap->chan_width_2 = HE_CH_WIDTH_GET_BIT(value, 2);
@@ -2518,114 +2518,114 @@ void csr_update_session_he_cap(tpAniSirGlobal mac_ctx,
 	he_cap->chan_width_5 = HE_CH_WIDTH_GET_BIT(value, 5);
 	he_cap->chan_width_6 = HE_CH_WIDTH_GET_BIT(value, 6);
 
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_RX_PREAM_PUNC, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_RX_PREAM_PUNC, &value);
 	he_cap->rx_pream_puncturing = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_CLASS_OF_DEVICE, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_CLASS_OF_DEVICE, &value);
 	he_cap->device_class = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_LDPC, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_LDPC, &value);
 	he_cap->ldpc_coding = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_LTF_PPDU, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_LTF_PPDU, &value);
 	he_cap->he_1x_ltf_800_gi_ppdu = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_MIDAMBLE_RX_MAX_NSTS, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_MIDAMBLE_RX_MAX_NSTS, &value);
 	he_cap->midamble_rx_max_nsts = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_LTF_NDP, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_LTF_NDP, &value);
 	he_cap->he_4x_ltf_3200_gi_ndp = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_TX_STBC_LT80, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_TX_STBC_LT80, &value);
 	he_cap->tx_stbc_lt_80mhz = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_RX_STBC_LT80, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_RX_STBC_LT80, &value);
 	he_cap->rx_stbc_lt_80mhz = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_DOPPLER, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_DOPPLER, &value);
 	he_cap->doppler = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_UL_MUMIMO, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_UL_MUMIMO, &value);
 	he_cap->ul_mu = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_DCM_TX, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_DCM_TX, &value);
 	he_cap->dcm_enc_tx = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_DCM_RX, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_DCM_RX, &value);
 	he_cap->dcm_enc_rx = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_MU_PPDU, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_MU_PPDU, &value);
 	he_cap->ul_he_mu = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_SU_BEAMFORMEE, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_SU_BEAMFORMEE, &value);
 	he_cap->su_beamformee = value;
 	if (he_cap->su_beamformee) {
-		sme_cfg_get_int(mac_ctx, WNI_CFG_HE_BFEE_STS_LT80, &value);
+		sme_cfg_get_int(mac_hdl, WNI_CFG_HE_BFEE_STS_LT80, &value);
 		he_cap->bfee_sts_lt_80 = value;
-		sme_cfg_get_int(mac_ctx, WNI_CFG_HE_BFEE_STS_GT80, &value);
+		sme_cfg_get_int(mac_hdl, WNI_CFG_HE_BFEE_STS_GT80, &value);
 		he_cap->bfee_sts_gt_80 = value;
 	} else {
 		he_cap->bfee_sts_lt_80 = 0;
 		he_cap->bfee_sts_gt_80 = 0;
 	}
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_SU_BEAMFORMER, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_SU_BEAMFORMER, &value);
 	he_cap->su_beamformer = value;
 	if (he_cap->su_beamformer) {
-		sme_cfg_get_int(mac_ctx, WNI_CFG_HE_MU_BEAMFORMER, &value);
+		sme_cfg_get_int(mac_hdl, WNI_CFG_HE_MU_BEAMFORMER, &value);
 		he_cap->mu_beamformer = value;
-		sme_cfg_get_int(mac_ctx, WNI_CFG_HE_NUM_SOUND_LT80, &value);
+		sme_cfg_get_int(mac_hdl, WNI_CFG_HE_NUM_SOUND_LT80, &value);
 		he_cap->num_sounding_lt_80 = value;
-		sme_cfg_get_int(mac_ctx, WNI_CFG_HE_NUM_SOUND_GT80, &value);
+		sme_cfg_get_int(mac_hdl, WNI_CFG_HE_NUM_SOUND_GT80, &value);
 		he_cap->num_sounding_gt_80 = value;
 	} else {
 		he_cap->mu_beamformer = 0;
 		he_cap->num_sounding_lt_80 = 0;
 		he_cap->num_sounding_gt_80 = 0;
 	}
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_SU_FEED_TONE16, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_SU_FEED_TONE16, &value);
 	he_cap->su_feedback_tone16 = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_MU_FEED_TONE16, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_MU_FEED_TONE16, &value);
 	he_cap->mu_feedback_tone16 = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_CODEBOOK_SU, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_CODEBOOK_SU, &value);
 	he_cap->codebook_su = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_CODEBOOK_MU, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_CODEBOOK_MU, &value);
 	he_cap->codebook_mu = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_BFRM_FEED, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_BFRM_FEED, &value);
 	he_cap->beamforming_feedback = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_ER_SU_PPDU, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_ER_SU_PPDU, &value);
 	he_cap->he_er_su_ppdu = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_DL_PART_BW, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_DL_PART_BW, &value);
 	he_cap->dl_mu_mimo_part_bw = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_PPET_PRESENT, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_PPET_PRESENT, &value);
 	he_cap->ppet_present = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_SRP, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_SRP, &value);
 	he_cap->srp = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_POWER_BOOST, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_POWER_BOOST, &value);
 	he_cap->power_boost = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_4x_LTF_GI, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_4x_LTF_GI, &value);
 	he_cap->he_ltf_800_gi_4x = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_MAX_NC, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_MAX_NC, &value);
 	he_cap->max_nc = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_TX_STBC_GT80, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_TX_STBC_GT80, &value);
 	he_cap->tx_stbc_gt_80mhz = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_RX_STBC_GT80, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_RX_STBC_GT80, &value);
 	he_cap->rx_stbc_gt_80mhz = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_ER_4x_LTF_GI, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_ER_4x_LTF_GI, &value);
 	he_cap->er_he_ltf_800_gi_4x = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_PPDU_20_IN_40MHZ_2G, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_PPDU_20_IN_40MHZ_2G, &value);
 	he_cap->he_ppdu_20_in_40Mhz_2G = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_PPDU_20_IN_160_80P80MHZ, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_PPDU_20_IN_160_80P80MHZ, &value);
 	he_cap->he_ppdu_20_in_160_80p80Mhz = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_PPDU_80_IN_160_80P80MHZ, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_PPDU_80_IN_160_80P80MHZ, &value);
 	he_cap->he_ppdu_80_in_160_80p80Mhz = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_ER_1X_HE_LTF_GI, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_ER_1X_HE_LTF_GI, &value);
 	he_cap->er_1x_he_ltf_gi = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_MIDAMBLE_RX_1X_HE_LTF, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_MIDAMBLE_RX_1X_HE_LTF, &value);
 	he_cap->midamble_rx_1x_he_ltf = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_RX_MCS_MAP_LT_80, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_RX_MCS_MAP_LT_80, &value);
 	he_cap->rx_he_mcs_map_lt_80 = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_TX_MCS_MAP_LT_80, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_TX_MCS_MAP_LT_80, &value);
 	he_cap->tx_he_mcs_map_lt_80 = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_RX_MCS_MAP_160, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_RX_MCS_MAP_160, &value);
 	*((uint16_t *)he_cap->rx_he_mcs_map_160) = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_TX_MCS_MAP_160, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_TX_MCS_MAP_160, &value);
 	*((uint16_t *)he_cap->tx_he_mcs_map_160) = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_RX_MCS_MAP_80_80, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_RX_MCS_MAP_80_80, &value);
 	*((uint16_t *)he_cap->rx_he_mcs_map_80_80) = value;
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_TX_MCS_MAP_80_80, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_TX_MCS_MAP_80_80, &value);
 	*((uint16_t *)he_cap->tx_he_mcs_map_80_80) = value;
 
 	if (he_cap->ppet_present) {
 		value = WNI_CFG_HE_PPET_LEN;
 		/* till now operating channel is not decided yet, use 5g cap */
-		sme_cfg_get_str(mac_ctx, WNI_CFG_HE_PPET_5G,
+		sme_cfg_get_str(mac_hdl, WNI_CFG_HE_PPET_5G,
 				he_cap->ppet.ppe_threshold.ppe_th, &value);
 		he_cap->ppet.ppe_threshold.num_ppe_th =
 			lim_truncate_ppet(he_cap->ppet.ppe_threshold.ppe_th,
@@ -2633,7 +2633,7 @@ void csr_update_session_he_cap(tpAniSirGlobal mac_ctx,
 	} else {
 		he_cap->ppet.ppe_threshold.num_ppe_th = 0;
 	}
-	sme_cfg_get_int(mac_ctx, WNI_CFG_HE_STA_OBSSPD, &value);
+	sme_cfg_get_int(mac_hdl, WNI_CFG_HE_STA_OBSSPD, &value);
 	session->he_sta_obsspd = value;
 }