qcacld-3.0: Replace PMAC_STRUCT() with MAC_CONTEXT()

The inline function MAC_CONTEXT() is the preferred mechanism for
converting a MAC handle into a MAC context, so replace all instances
of the legacy macro PMAC_STRUCT().

Change-Id: Ieb29696c79b729648462be699892607484c2f301
CRs-Fixed: 2357873

core/mac/inc/ani_global.h

@@ -60,9 +60,6 @@ static inline tpAniSirGlobal MAC_CONTEXT(mac_handle_t handle)
 	return (tpAniSirGlobal)handle;
 }
 
-/* legacy definition */
-#define PMAC_STRUCT(handle)  MAC_CONTEXT(handle)
-
 /**
  * MAC_HANDLE() - Convert a mac context into an opaque mac handle
  * @mac: MAC context to be converted
@@ -70,7 +67,7 @@ static inline tpAniSirGlobal MAC_CONTEXT(mac_handle_t handle)
  * Given a mac context this function will return the opaque mac handle
  * that is associated with that handle.
  *
- * This is the inverse function of PMAC_STRUCT()
+ * This is the inverse function of MAC_CONTEXT()
  *
  * Return: opaque handle for @mac
  */

core/sap/src/sap_api_link_cntl.c

@@ -98,7 +98,7 @@ void sap_config_acs_result(mac_handle_t mac_handle,
 {
 	uint32_t channel = sap_ctx->acs_cfg->pri_ch;
 	struct ch_params ch_params = {0};
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
 
 	ch_params.ch_width = sap_ctx->acs_cfg->ch_width;
 	wlan_reg_set_channel_params(mac_ctx->pdev, channel, sec_ch,
@@ -415,7 +415,7 @@ wlansap_roam_process_dfs_chansw_update(mac_handle_t mac_handle,
 {
 	uint8_t intf;
 	QDF_STATUS qdf_status;
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
 	uint8_t dfs_beacon_start_req = 0;
 	bool sap_scc_dfs;
 

core/sap/src/sap_ch_select.c

@@ -335,7 +335,7 @@ static void sap_process_avoid_ie(mac_handle_t mac_handle,
 	tpAniSirGlobal mac_ctx = NULL;
 	tSapSpectChInfo *spect_ch = NULL;
 
-	mac_ctx = PMAC_STRUCT(mac_handle);
+	mac_ctx = MAC_CONTEXT(mac_handle);
 	spect_ch = spect_info->pSpectCh;
 	node = sme_scan_result_get_first(mac_handle, scan_result);
 
@@ -422,7 +422,7 @@ void sap_update_unsafe_channel_list(mac_handle_t mac_handle,
 			  "qdf_ctx is NULL");
 		return;
 	}
-	mac_ctx = PMAC_STRUCT(mac_handle);
+	mac_ctx = MAC_CONTEXT(mac_handle);
 
 	/* Flush, default set all channel safe */
 	for (i = 0; i < NUM_CHANNELS; i++) {
@@ -575,7 +575,7 @@ static bool sap_chan_sel_init(mac_handle_t mac_handle,
 	tSapSpectChInfo *pSpectCh = NULL;
 	uint8_t *pChans = NULL;
 	uint16_t channelnum = 0;
-	tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
 	bool chSafe = true;
 #ifdef FEATURE_WLAN_CH_AVOID
 	uint16_t i;
@@ -2541,7 +2541,7 @@ static uint8_t sap_select_channel_no_scan_result(mac_handle_t mac_handle,
 	uint32_t end_ch_num = sap_ctx->acs_cfg->end_ch;
 	tpAniSirGlobal mac_ctx = NULL;
 
-	mac_ctx = PMAC_STRUCT(mac_handle);
+	mac_ctx = MAC_CONTEXT(mac_handle);
 
 	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  FL("start - end: %d - %d"), start_ch_num, end_ch_num);
@@ -2644,7 +2644,7 @@ uint8_t sap_select_channel(mac_handle_t mac_handle,
 #endif
 	tpAniSirGlobal mac_ctx;
 
-	mac_ctx = PMAC_STRUCT(mac_handle);
+	mac_ctx = MAC_CONTEXT(mac_handle);
 	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "In %s, Running SAP Ch Select", __func__);
 

core/sap/src/sap_fsm.c

@@ -554,7 +554,7 @@ bool sap_dfs_is_w53_invalid(mac_handle_t mac_handle, uint8_t channel_id)
 {
 	tpAniSirGlobal mac;
 
-	mac = PMAC_STRUCT(mac_handle);
+	mac = MAC_CONTEXT(mac_handle);
 	if (NULL == mac) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("invalid mac"));
@@ -577,7 +577,7 @@ bool sap_dfs_is_channel_in_preferred_location(mac_handle_t mac_handle,
 {
 	tpAniSirGlobal mac;
 
-	mac = PMAC_STRUCT(mac_handle);
+	mac = MAC_CONTEXT(mac_handle);
 	if (NULL == mac) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("invalid mac"));
@@ -989,7 +989,7 @@ QDF_STATUS sap_channel_sel(struct sap_context *sap_context)
 		return QDF_STATUS_E_FAULT;
 	}
 
-	mac_ctx = PMAC_STRUCT(mac_handle);
+	mac_ctx = MAC_CONTEXT(mac_handle);
 	if (!mac_ctx) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("Invalid MAC context"));
@@ -1157,7 +1157,7 @@ QDF_STATUS sap_channel_sel(struct sap_context *sap_context)
 static struct sap_context *
 sap_find_valid_concurrent_session(mac_handle_t mac_handle)
 {
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
 	uint8_t intf = 0;
 	struct sap_context *sap_ctx;
 
@@ -1178,7 +1178,7 @@ sap_find_valid_concurrent_session(mac_handle_t mac_handle)
 
 static QDF_STATUS sap_clear_global_dfs_param(mac_handle_t mac_handle)
 {
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
 
 	if (NULL != sap_find_valid_concurrent_session(mac_handle)) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
@@ -1243,7 +1243,7 @@ QDF_STATUS sap_set_session_param(mac_handle_t mac_handle,
 				 struct sap_context *sapctx,
 				 uint32_t session_id)
 {
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
 	int i;
 	QDF_STATUS status;
 
@@ -1282,7 +1282,7 @@ QDF_STATUS sap_clear_session_param(mac_handle_t mac_handle,
 				   struct sap_context *sapctx,
 				   uint32_t session_id)
 {
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
 
 	if (sapctx->sessionId >= SAP_MAX_NUM_SESSION)
 		return QDF_STATUS_E_FAILURE;
@@ -1809,7 +1809,7 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx,
  */
 static struct sap_context *sap_find_cac_wait_session(mac_handle_t handle)
 {
-	tpAniSirGlobal mac = PMAC_STRUCT(handle);
+	tpAniSirGlobal mac = MAC_CONTEXT(handle);
 	uint8_t i = 0;
 	struct sap_context *sap_ctx;
 
@@ -1840,7 +1840,7 @@ static struct sap_context *sap_find_cac_wait_session(mac_handle_t handle)
 void sap_cac_reset_notify(mac_handle_t mac_handle)
 {
 	uint8_t intf = 0;
-	tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
 
 	for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) {
 		struct sap_context *sap_context =
@@ -1867,7 +1867,7 @@ void sap_cac_reset_notify(mac_handle_t mac_handle)
 static QDF_STATUS sap_cac_start_notify(mac_handle_t mac_handle)
 {
 	uint8_t intf = 0;
-	tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
 
 	for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) {
@@ -1962,7 +1962,7 @@ static QDF_STATUS sap_cac_end_notify(mac_handle_t mac_handle,
 				     struct csr_roam_info *roamInfo)
 {
 	uint8_t intf;
-	tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
 
 	/*
@@ -3509,7 +3509,7 @@ void sap_dfs_cac_timer_callback(void *data)
 			  "In %s invalid mac_handle", __func__);
 		return;
 	}
-	mac = PMAC_STRUCT(mac_handle);
+	mac = MAC_CONTEXT(mac_handle);
 	sapContext = sap_find_cac_wait_session(mac_handle);
 	if (NULL == sapContext) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
@@ -3695,7 +3695,7 @@ QDF_STATUS sap_init_dfs_channel_nol_list(struct sap_context *sap_ctx)
  */
 uint8_t sap_get_total_number_sap_intf(mac_handle_t mac_handle)
 {
-	tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
 	uint8_t intf = 0;
 	uint8_t intf_count = 0;
 
@@ -3725,7 +3725,7 @@ uint8_t sap_get_total_number_sap_intf(mac_handle_t mac_handle)
 bool is_concurrent_sap_ready_for_channel_change(mac_handle_t mac_handle,
 						struct sap_context *sapContext)
 {
-	tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
 	struct sap_context *sap_context;
 	uint8_t intf = 0;
 
@@ -3769,7 +3769,7 @@ bool is_concurrent_sap_ready_for_channel_change(mac_handle_t mac_handle,
 bool sap_is_conc_sap_doing_scc_dfs(mac_handle_t mac_handle,
 				   struct sap_context *given_sapctx)
 {
-	tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
 	struct sap_context *sap_ctx;
 	uint8_t intf = 0, scc_dfs_counter = 0;
 

core/sap/src/sap_module.c

@@ -1556,7 +1556,7 @@ bool wlan_sap_is_pre_cac_active(mac_handle_t handle)
 	tpAniSirGlobal mac = NULL;
 	int i;
 
-	mac = PMAC_STRUCT(handle);
+	mac = MAC_CONTEXT(handle);
 	if (!mac) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			"%s: Invalid mac context", __func__);
@@ -1586,7 +1586,7 @@ QDF_STATUS wlan_sap_get_pre_cac_vdev_id(mac_handle_t handle, uint8_t *vdev_id)
 	tpAniSirGlobal mac = NULL;
 	uint8_t i;
 
-	mac = PMAC_STRUCT(handle);
+	mac = MAC_CONTEXT(handle);
 	if (!mac) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			"%s: Invalid mac context", __func__);
@@ -1828,7 +1828,7 @@ QDF_STATUS wlansap_get_dfs_ignore_cac(mac_handle_t mac_handle,
 	tpAniSirGlobal mac = NULL;
 
 	if (NULL != mac_handle) {
-		mac = PMAC_STRUCT(mac_handle);
+		mac = MAC_CONTEXT(mac_handle);
 	} else {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid mac_handle pointer", __func__);
@@ -1845,7 +1845,7 @@ QDF_STATUS wlansap_set_dfs_ignore_cac(mac_handle_t mac_handle,
 	tpAniSirGlobal mac = NULL;
 
 	if (NULL != mac_handle) {
-		mac = PMAC_STRUCT(mac_handle);
+		mac = MAC_CONTEXT(mac_handle);
 	} else {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid mac_handle pointer", __func__);
@@ -1866,7 +1866,7 @@ wlansap_set_dfs_restrict_japan_w53(mac_handle_t mac_handle,
 	enum dfs_reg dfs_region;
 
 	if (NULL != mac_handle) {
-		mac = PMAC_STRUCT(mac_handle);
+		mac = MAC_CONTEXT(mac_handle);
 	} else {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid mac_handle pointer", __func__);
@@ -1925,7 +1925,7 @@ wlan_sap_set_channel_avoidance(mac_handle_t mac_handle,
 	tpAniSirGlobal mac_ctx = NULL;
 
 	if (NULL != mac_handle) {
-		mac_ctx = PMAC_STRUCT(mac_handle);
+		mac_ctx = MAC_CONTEXT(mac_handle);
 	} else {
 		QDF_TRACE(QDF_MODULE_ID_SAP,
 			  QDF_TRACE_LEVEL_ERROR,
@@ -1962,7 +1962,7 @@ wlansap_set_dfs_preferred_channel_location(mac_handle_t mac_handle,
 	enum dfs_reg dfs_region;
 
 	if (NULL != mac_handle) {
-		mac = PMAC_STRUCT(mac_handle);
+		mac = MAC_CONTEXT(mac_handle);
 	} else {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid mac_handle pointer", __func__);
@@ -2004,7 +2004,7 @@ QDF_STATUS wlansap_set_dfs_target_chnl(mac_handle_t mac_handle,
 	tpAniSirGlobal mac = NULL;
 
 	if (NULL != mac_handle) {
-		mac = PMAC_STRUCT(mac_handle);
+		mac = MAC_CONTEXT(mac_handle);
 	} else {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid mac_handle pointer", __func__);
@@ -2180,7 +2180,7 @@ void wlansap_extend_to_acs_range(mac_handle_t mac_handle,
 	uint8_t tmp_startChannelNum = 0, tmp_endChannelNum = 0;
 	tpAniSirGlobal mac_ctx;
 
-	mac_ctx = PMAC_STRUCT(mac_handle);
+	mac_ctx = MAC_CONTEXT(mac_handle);
 	if (!mac_ctx) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			"%s: Invalid mac_ctx", __func__);
@@ -2436,7 +2436,7 @@ void wlan_sap_enable_phy_error_logs(mac_handle_t mac_handle,
 {
 	int error;
 
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
 
 	mac_ctx->sap.enable_dfs_phy_error_logs = !!enable_log;
 	tgt_dfs_control(mac_ctx->pdev, DFS_SET_DEBUG_LEVEL, &enable_log,
@@ -2459,7 +2459,7 @@ QDF_STATUS wlansap_set_tx_leakage_threshold(mac_handle_t mac_handle,
 		return QDF_STATUS_E_FAULT;
 	}
 
-	mac = PMAC_STRUCT(mac_handle);
+	mac = MAC_CONTEXT(mac_handle);
 	tgt_dfs_set_tx_leakage_threshold(mac->pdev, tx_leakage_threshold);
 	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
 		  "%s: leakage_threshold %d", __func__,

core/sme/src/common/sme_ft_api.c

@@ -25,7 +25,7 @@
 /* Initialize the FT context. */
 void sme_ft_open(mac_handle_t mac_handle, uint32_t sessionId)
 {
-	tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
 
@@ -60,7 +60,7 @@ void sme_ft_open(mac_handle_t mac_handle, uint32_t sessionId)
 /* Cleanup the SME FT Global context. */
 void sme_ft_close(mac_handle_t mac_handle, uint32_t sessionId)
 {
-	tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
 	struct csr_roam_session *pSession = NULL;
 
 	/* Clear the FT Context */
@@ -89,7 +89,7 @@ void sme_ft_close(mac_handle_t mac_handle, uint32_t sessionId)
 void sme_set_ft_pre_auth_state(mac_handle_t mac_handle, uint32_t sessionId,
 			       bool state)
 {
-	tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
 	struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
 
 	if (pSession)
@@ -98,7 +98,7 @@ void sme_set_ft_pre_auth_state(mac_handle_t mac_handle, uint32_t sessionId,
 
 bool sme_get_ft_pre_auth_state(mac_handle_t mac_handle, uint32_t sessionId)
 {
-	tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
 	struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
 
 	if (pSession)
@@ -122,7 +122,7 @@ bool sme_get_ft_pre_auth_state(mac_handle_t mac_handle, uint32_t sessionId)
 void sme_set_ft_ies(mac_handle_t mac_handle, uint32_t session_id,
 		    const uint8_t *ft_ies, uint16_t ft_ies_length)
 {
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
 	struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id);
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 
@@ -284,7 +284,7 @@ QDF_STATUS sme_ft_send_update_key_ind(tpAniSirGlobal mac, uint32_t session_id,
 
 bool sme_get_ftptk_state(mac_handle_t mac_handle, uint32_t sessionId)
 {
-	tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
 	struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
 
 	if (!pSession) {
@@ -297,7 +297,7 @@ bool sme_get_ftptk_state(mac_handle_t mac_handle, uint32_t sessionId)
 void sme_set_ftptk_state(mac_handle_t mac_handle, uint32_t sessionId,
 			 bool state)
 {
-	tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
 	struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
 
 	if (!pSession) {
@@ -310,7 +310,7 @@ void sme_set_ftptk_state(mac_handle_t mac_handle, uint32_t sessionId,
 QDF_STATUS sme_ft_update_key(mac_handle_t mac_handle, uint32_t sessionId,
 			     tCsrRoamSetKey *pFTKeyInfo)
 {
-	tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
 	struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 
@@ -373,7 +373,7 @@ void sme_get_ft_pre_auth_response(mac_handle_t mac_handle, uint32_t sessionId,
 				  uint8_t *ft_ies, uint32_t ft_ies_ip_len,
 				  uint16_t *ft_ies_length)
 {
-	tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
 	struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 
@@ -423,7 +423,7 @@ void sme_get_rici_es(mac_handle_t mac_handle, uint32_t sessionId,
 		     uint8_t *ric_ies,
 		     uint32_t ric_ies_ip_len, uint32_t *ric_ies_length)
 {
-	tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
 	struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 
@@ -475,7 +475,7 @@ void sme_preauth_reassoc_intvl_timer_callback(void *context)
 /* Reset the FT context. */
 void sme_ft_reset(mac_handle_t mac_handle, uint32_t sessionId)
 {
-	tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
 	struct csr_roam_session *pSession = NULL;
 
 	if (mac == NULL) {

core/sme/src/common/sme_power_save.c

@@ -371,7 +371,7 @@ QDF_STATUS sme_ps_enable_disable(mac_handle_t mac_handle, uint32_t session_id,
 				 enum sme_ps_cmd command)
 {
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
 
 	status =  sme_enable_sta_ps_check(mac_ctx, session_id);
 	if (status != QDF_STATUS_SUCCESS) {
@@ -393,7 +393,7 @@ QDF_STATUS sme_ps_enable_disable(mac_handle_t mac_handle, uint32_t session_id,
 QDF_STATUS sme_ps_timer_flush_sync(mac_handle_t mac_handle, uint8_t session_id)
 {
 	QDF_STATUS status;
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
 	struct ps_params *ps_parm;
 	enum ps_state ps_state;
 	QDF_TIMER_STATE tstate;
@@ -460,7 +460,7 @@ QDF_STATUS sme_ps_uapsd_enable(mac_handle_t mac_handle, uint32_t session_id)
 {
 
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
 
 	status =  sme_enable_sta_ps_check(mac_ctx, session_id);
 	if (status != QDF_STATUS_SUCCESS)
@@ -484,7 +484,7 @@ QDF_STATUS sme_ps_uapsd_disable(mac_handle_t mac_handle, uint32_t session_id)
 {
 
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
 
 	status = sme_enable_sta_ps_check(mac_ctx, session_id);
 	if (status != QDF_STATUS_SUCCESS)
@@ -611,7 +611,7 @@ QDF_STATUS sme_set_ps_host_offload(mac_handle_t mac_handle,
 {
 	tpSirHostOffloadReq request_buf;
 	struct scheduler_msg msg = {0};
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
 	struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id);
 
 	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
@@ -667,7 +667,7 @@ QDF_STATUS sme_set_ps_ns_offload(mac_handle_t mac_handle,
 				 tpSirHostOffloadReq request,
 				 uint8_t session_id)
 {
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
 	tpSirHostOffloadReq request_buf;
 	struct scheduler_msg msg = {0};
 	struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id);
@@ -741,7 +741,7 @@ QDF_STATUS sme_post_pe_message(tpAniSirGlobal mac_ctx,
 QDF_STATUS sme_ps_enable_auto_ps_timer(mac_handle_t mac_handle,
 				       uint32_t session_id, uint32_t timeout)
 {
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
 	struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info;
 	struct ps_params *ps_param = &ps_global_info->ps_params[session_id];
 	QDF_STATUS qdf_status;
@@ -770,7 +770,7 @@ QDF_STATUS sme_ps_enable_auto_ps_timer(mac_handle_t mac_handle,
 QDF_STATUS sme_ps_disable_auto_ps_timer(mac_handle_t mac_handle,
 					uint32_t session_id)
 {
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
 	struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info;
 	struct ps_params *ps_param = &ps_global_info->ps_params[session_id];
 	/*
@@ -805,7 +805,7 @@ QDF_STATUS sme_ps_open(mac_handle_t mac_handle)
 
 QDF_STATUS sme_ps_open_per_session(mac_handle_t mac_handle, uint32_t session_id)
 {
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
 	struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info;
 	struct ps_params *ps_param = &ps_global_info->ps_params[session_id];
 
@@ -863,7 +863,7 @@ QDF_STATUS sme_ps_close_per_session(mac_handle_t mac_handle,
 				    uint32_t session_id)
 {
 
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
 	struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info;
 	struct ps_params *ps_param = &ps_global_info->ps_params[session_id];
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
@@ -886,7 +886,7 @@ QDF_STATUS sme_ps_close_per_session(mac_handle_t mac_handle,
 bool sme_is_auto_ps_timer_running(mac_handle_t mac_handle,
 				  uint32_t session_id)
 {
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle);
 	struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info;
 	struct ps_params *ps_param = &ps_global_info->ps_params[session_id];
 	bool status = false;

core/sme/src/qos/sme_qos.c

@@ -681,7 +681,7 @@ enum sme_qos_statustype sme_qos_setup_req(mac_handle_t mac_handle,
 {
 	struct sme_qos_sessioninfo *pSession;
 	QDF_STATUS lock_status = QDF_STATUS_E_FAILURE;
-	tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
 	enum sme_qos_statustype status;
 
 	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
@@ -755,7 +755,7 @@ enum sme_qos_statustype sme_qos_modify_req(mac_handle_t mac_handle,
 					uint32_t QosFlowID)
 {
 	QDF_STATUS lock_status = QDF_STATUS_E_FAILURE;
-	tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
 	enum sme_qos_statustype status;
 
 	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
@@ -798,7 +798,7 @@ enum sme_qos_statustype sme_qos_release_req(mac_handle_t mac_handle,
 					    uint32_t QosFlowID)
 {
 	QDF_STATUS lock_status = QDF_STATUS_E_FAILURE;
-	tpAniSirGlobal mac = PMAC_STRUCT(mac_handle);
+	tpAniSirGlobal mac = MAC_CONTEXT(mac_handle);
 	enum sme_qos_statustype status;
 
 	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,