qcacld-3.0: Replace tpAniSirGlobal in LIM misc

To align with the Linux coding style replace tpAniSirGlobal with
struct mac_context * in:
lim_admit_control.c
lim_admit_control.h
lim_aid_mgmt.c
lim_assoc_utils.c
lim_assoc_utils.h
lim_ft.c
lim_ft.h
lim_ft_preauth.c
lim_ibss_peer_mgmt.c
lim_ibss_peer_mgmt.h
lim_link_monitoring_algo.c
lim_process_action_frame.c
lim_process_assoc_req_frame.c
lim_process_assoc_rsp_frame.c
lim_process_auth_frame.c
lim_process_beacon_frame.c
lim_process_cfg_updates.c
lim_process_deauth_frame.c
lim_process_disassoc_frame.c
lim_process_fils.c
lim_process_fils.h
lim_process_message_queue.c
lim_process_mlm_host_roam.c
lim_process_mlm_req_messages.c
lim_process_mlm_rsp_messages.c
lim_process_probe_req_frame.c
lim_process_probe_rsp_frame.c
lim_process_tdls.c
lim_prop_exts_utils.c
lim_prop_exts_utils.h
lim_reassoc_utils.c
lim_roam_timer_utils.c
lim_scan_result_utils.c
lim_scan_result_utils.h
lim_security_utils.c
lim_security_utils.h
lim_send_frames_host_roam.c
lim_send_management_frames.c
lim_send_messages.c
lim_send_messages.h
lim_send_sme_rsp_messages.c
lim_send_sme_rsp_messages.h
lim_ser_des_utils.c
lim_ser_des_utils.h
lim_session.c
lim_session.h
lim_session_utils.c
lim_session_utils.h
lim_sme_req_utils.c
lim_sme_req_utils.h
lim_sta_hash_api.c
lim_sta_hash_api.h
lim_timer_utils.c
lim_timer_utils.h
lim_trace.c
lim_trace.h

Change-Id: Ia3fa828ad2c1572beeaac363324dbf575e335876
CRs-Fixed: 2360307

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

@@ -35,18 +35,18 @@
 #include "ani_global.h"
 
 QDF_STATUS
-lim_tspec_find_by_assoc_id(tpAniSirGlobal, uint16_t, tSirMacTspecIE *,
+lim_tspec_find_by_assoc_id(struct mac_context *, uint16_t, tSirMacTspecIE *,
 			   tpLimTspecInfo, tpLimTspecInfo *);
 
 /* Add TSPEC in lim local table */
-QDF_STATUS lim_tspec_add(tpAniSirGlobal mac,
+QDF_STATUS lim_tspec_add(struct mac_context *mac,
 			    uint8_t *pAddr,
 			    uint16_t assocId,
 			    tSirMacTspecIE *pTspec,
 			    uint32_t interval, tpLimTspecInfo *ppInfo);
 
 /* admit control interface */
-extern QDF_STATUS lim_admit_control_add_ts(tpAniSirGlobal mac,
+extern QDF_STATUS lim_admit_control_add_ts(struct mac_context *mac,
 				uint8_t *pAddr, tSirAddtsReqInfo *addts,
 				tSirMacQosCapabilityStaIE *qos,
 				uint16_t assocId, uint8_t alloc,
@@ -56,41 +56,41 @@ extern QDF_STATUS lim_admit_control_add_ts(tpAniSirGlobal mac,
 				struct pe_session *pe_session);
 
 static inline QDF_STATUS
-lim_admit_control_add_sta(tpAniSirGlobal mac, uint8_t *staAddr, uint8_t alloc)
+lim_admit_control_add_sta(struct mac_context *mac, uint8_t *staAddr, uint8_t alloc)
 {
 	return QDF_STATUS_SUCCESS;
 }
 
 extern QDF_STATUS
-lim_admit_control_delete_sta(tpAniSirGlobal mac, uint16_t assocId);
+lim_admit_control_delete_sta(struct mac_context *mac, uint16_t assocId);
 
 extern QDF_STATUS
-lim_admit_control_delete_ts(tpAniSirGlobal mac,
+lim_admit_control_delete_ts(struct mac_context *mac,
 			    uint16_t assocId,
 			    tSirMacTSInfo *tsinfo,
 			    uint8_t *tsStatus, uint8_t *tspecIdx);
 
-QDF_STATUS lim_admit_control_init(tpAniSirGlobal mac);
+QDF_STATUS lim_admit_control_init(struct mac_context *mac);
 #ifdef FEATURE_WLAN_ESE
-QDF_STATUS lim_send_hal_msg_add_ts(tpAniSirGlobal mac,
+QDF_STATUS lim_send_hal_msg_add_ts(struct mac_context *mac,
 				      uint16_t staIdx,
 				      uint8_t tspecIdx,
 				      tSirMacTspecIE tspecIE,
 				      uint8_t sessionId, uint16_t tsm_interval);
 #else
-QDF_STATUS lim_send_hal_msg_add_ts(tpAniSirGlobal mac,
+QDF_STATUS lim_send_hal_msg_add_ts(struct mac_context *mac,
 				      uint16_t staIdx,
 				      uint8_t tspecIdx,
 				      tSirMacTspecIE tspecIE,
 				      uint8_t sessionId);
 #endif
 
-QDF_STATUS lim_send_hal_msg_del_ts(tpAniSirGlobal mac,
+QDF_STATUS lim_send_hal_msg_del_ts(struct mac_context *mac,
 				      uint16_t staIdx,
 				      uint8_t tspecIdx,
 				      tSirDeltsReqInfo delts,
 				      uint8_t sessionId, uint8_t *bssId);
-void lim_process_hal_add_ts_rsp(tpAniSirGlobal mac,
+void lim_process_hal_add_ts_rsp(struct mac_context *mac,
 				struct scheduler_msg *limMsg);
 
 #endif

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

@@ -33,14 +33,14 @@
 /*-------------------------------------------------------------------------
    Function declarations and documenation
    ------------------------------------------------------------------------*/
-void lim_ft_open(tpAniSirGlobal mac, struct pe_session *pe_session);
-void lim_ft_cleanup(tpAniSirGlobal mac, struct pe_session *pe_session);
+void lim_ft_open(struct mac_context *mac, struct pe_session *pe_session);
+void lim_ft_cleanup(struct mac_context *mac, struct pe_session *pe_session);
 #ifdef WLAN_FEATURE_HOST_ROAM
-void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal mac,
+void lim_ft_cleanup_pre_auth_info(struct mac_context *mac,
 		struct pe_session *pe_session);
-int lim_process_ft_pre_auth_req(tpAniSirGlobal mac,
+int lim_process_ft_pre_auth_req(struct mac_context *mac,
 				struct scheduler_msg *pMsg);
-void lim_process_ft_preauth_rsp_timeout(tpAniSirGlobal mac);
+void lim_process_ft_preauth_rsp_timeout(struct mac_context *mac);
 
 /**
  * lim_process_mlm_ft_reassoc_req() - Handle the Reassoc request
@@ -51,57 +51,57 @@ void lim_process_ft_preauth_rsp_timeout(tpAniSirGlobal mac);
  *
  *  Return: None
  */
-void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal mac,
+void lim_process_mlm_ft_reassoc_req(struct mac_context *mac,
 				    tLimMlmReassocReq *reassoc_req);
-void lim_perform_ft_pre_auth(tpAniSirGlobal mac, QDF_STATUS status,
+void lim_perform_ft_pre_auth(struct mac_context *mac, QDF_STATUS status,
 		uint32_t *data, struct pe_session *pe_session);
-void lim_post_ft_pre_auth_rsp(tpAniSirGlobal mac, QDF_STATUS status,
+void lim_post_ft_pre_auth_rsp(struct mac_context *mac, QDF_STATUS status,
 		uint8_t *auth_rsp, uint16_t auth_rsp_length,
 		struct pe_session *pe_session);
-void lim_handle_ft_pre_auth_rsp(tpAniSirGlobal mac, QDF_STATUS status,
+void lim_handle_ft_pre_auth_rsp(struct mac_context *mac, QDF_STATUS status,
 		uint8_t *auth_rsp, uint16_t auth_rsp_len,
 		struct pe_session *pe_session);
-QDF_STATUS lim_ft_setup_auth_session(tpAniSirGlobal mac,
+QDF_STATUS lim_ft_setup_auth_session(struct mac_context *mac,
 		struct pe_session *pe_session);
-void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg);
-void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal mac,
+void lim_process_mlm_reassoc_cnf(struct mac_context *mac_ctx, uint32_t *msg);
+void lim_process_sta_mlm_add_bss_rsp_ft(struct mac_context *mac,
 		struct scheduler_msg *limMsgQ, struct pe_session *pe_session);
-void lim_process_mlm_reassoc_req(tpAniSirGlobal mac_ctx,
+void lim_process_mlm_reassoc_req(struct mac_context *mac_ctx,
 				 tLimMlmReassocReq *reassoc_req);
-void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx,
+void lim_preauth_scan_event_handler(struct mac_context *mac_ctx,
 				enum sir_scan_event_type event,
 				uint8_t session_id,
 				uint32_t scan_id);
-QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx,
+QDF_STATUS lim_send_preauth_scan_offload(struct mac_context *mac_ctx,
 		struct pe_session *session_entry, tSirFTPreAuthReq *ft_preauth_req);
 #else
-static inline void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal mac,
+static inline void lim_ft_cleanup_pre_auth_info(struct mac_context *mac,
 		struct pe_session *pe_session)
 {}
-static inline void lim_process_ft_preauth_rsp_timeout(tpAniSirGlobal mac)
+static inline void lim_process_ft_preauth_rsp_timeout(struct mac_context *mac)
 {}
 static inline
-void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal mac,
+void lim_process_mlm_ft_reassoc_req(struct mac_context *mac,
 				    tLimMlmReassocReq *reassoc_req)
 {}
-static inline void lim_handle_ft_pre_auth_rsp(tpAniSirGlobal mac,
+static inline void lim_handle_ft_pre_auth_rsp(struct mac_context *mac,
 		QDF_STATUS status, uint8_t *auth_rsp,
 		uint16_t auth_rsp_len, struct pe_session *pe_session)
 {}
-static inline void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx,
+static inline void lim_process_mlm_reassoc_cnf(struct mac_context *mac_ctx,
 		uint32_t *msg)
 {}
-static inline void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal mac,
+static inline void lim_process_sta_mlm_add_bss_rsp_ft(struct mac_context *mac,
 		struct scheduler_msg *limMsgQ, struct pe_session *pe_session)
 {}
-static inline void lim_process_mlm_reassoc_req(tpAniSirGlobal mac_ctx,
+static inline void lim_process_mlm_reassoc_req(struct mac_context *mac_ctx,
 					       tLimMlmReassocReq *reassoc_req)
 {}
-static inline void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx,
+static inline void lim_preauth_scan_event_handler(struct mac_context *mac_ctx,
 		enum sir_scan_event_type event,
 		uint8_t session_id, uint32_t scan_id)
 {}
-static inline int lim_process_ft_pre_auth_req(tpAniSirGlobal mac,
+static inline int lim_process_ft_pre_auth_req(struct mac_context *mac,
 		struct scheduler_msg *pMsg)
 {
 	return 0;
@@ -109,31 +109,31 @@ static inline int lim_process_ft_pre_auth_req(tpAniSirGlobal mac,
 #endif
 
 #if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD)
-void lim_fill_ft_session(tpAniSirGlobal mac,
+void lim_fill_ft_session(struct mac_context *mac,
 		tpSirBssDescription pbssDescription,
 		struct pe_session *ft_session,
 		struct pe_session *pe_session);
-void lim_ft_prepare_add_bss_req(tpAniSirGlobal mac, uint8_t updateEntry,
+void lim_ft_prepare_add_bss_req(struct mac_context *mac, uint8_t updateEntry,
 		struct pe_session *ft_session,
 		tpSirBssDescription bssDescription);
-QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx,
+QDF_STATUS lim_send_preauth_scan_offload(struct mac_context *mac_ctx,
 		struct pe_session *session_entry, tSirFTPreAuthReq *ft_preauth_req);
 #else
-static inline void lim_fill_ft_session(tpAniSirGlobal mac,
+static inline void lim_fill_ft_session(struct mac_context *mac,
 		tpSirBssDescription pbssDescription,
 		struct pe_session *ft_session,
 		struct pe_session *pe_session)
 {}
-static inline void lim_ft_prepare_add_bss_req(tpAniSirGlobal mac,
+static inline void lim_ft_prepare_add_bss_req(struct mac_context *mac,
 		uint8_t updateEntry, struct pe_session *ft_session,
 		tpSirBssDescription bssDescription)
 {}
 #endif
 
-bool lim_process_ft_update_key(tpAniSirGlobal mac, uint32_t *pMsgBuf);
-QDF_STATUS lim_process_ft_aggr_qos_req(tpAniSirGlobal mac,
+bool lim_process_ft_update_key(struct mac_context *mac, uint32_t *pMsgBuf);
+QDF_STATUS lim_process_ft_aggr_qos_req(struct mac_context *mac,
 		uint32_t *pMsgBuf);
-void lim_process_ft_aggr_qo_s_rsp(tpAniSirGlobal mac,
+void lim_process_ft_aggr_qo_s_rsp(struct mac_context *mac,
 				  struct scheduler_msg *limMsg);
-void lim_ft_cleanup_all_ft_sessions(tpAniSirGlobal mac);
+void lim_ft_cleanup_all_ft_sessions(struct mac_context *mac);
 #endif /* __LIMFT_H__ */

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

@@ -31,7 +31,7 @@
  *
  * Return: true if fils data needs to be processed else false
  */
-bool lim_process_fils_auth_frame2(tpAniSirGlobal mac_ctx,
+bool lim_process_fils_auth_frame2(struct mac_context *mac_ctx,
 				struct pe_session *pe_session,
 				tSirMacAuthFrameBody * rx_auth_frm_body);
 
@@ -58,7 +58,7 @@ void lim_add_fils_data_to_auth_frame(struct pe_session *session, uint8_t *body);
  *
  * Return: true if frame is valid or fils is disable, false otherwise
  */
-bool lim_is_valid_fils_auth_frame(tpAniSirGlobal mac_ctx,
+bool lim_is_valid_fils_auth_frame(struct mac_context *mac_ctx,
 	struct pe_session *pe_session, tSirMacAuthFrameBody *rx_auth_frm_body);
 
 /**
@@ -99,7 +99,7 @@ void lim_update_fils_config(struct pe_session *session, tpSirSmeJoinReq sme_join
  *
  * Return: length of fils data
  */
-uint32_t lim_create_fils_auth_data(tpAniSirGlobal mac_ctx,
+uint32_t lim_create_fils_auth_data(struct mac_context *mac_ctx,
 		tpSirMacAuthFrameBody auth_frame, struct pe_session *session);
 
 /**
@@ -128,7 +128,7 @@ static inline void lim_increase_fils_sequence_number(struct pe_session *session_
  *
  * Return: None
  */
-void populate_fils_connect_params(tpAniSirGlobal mac_ctx,
+void populate_fils_connect_params(struct mac_context *mac_ctx,
 				  struct pe_session *session,
 				  tpSirSmeJoinRsp sme_join_rsp);
 
@@ -144,7 +144,7 @@ void populate_fils_connect_params(tpAniSirGlobal mac_ctx,
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS aead_encrypt_assoc_req(tpAniSirGlobal mac_ctx,
+QDF_STATUS aead_encrypt_assoc_req(struct mac_context *mac_ctx,
 				  struct pe_session *pe_session,
 				  uint8_t *frame, uint32_t *payload);
 
@@ -161,7 +161,7 @@ QDF_STATUS aead_encrypt_assoc_req(tpAniSirGlobal mac_ctx,
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS aead_decrypt_assoc_rsp(tpAniSirGlobal mac_ctx,
+QDF_STATUS aead_decrypt_assoc_rsp(struct mac_context *mac_ctx,
 				  struct pe_session *session,
 				  tDot11fAssocResponse *ar,
 				  uint8_t *p_frame, uint32_t *n_frame);
@@ -192,7 +192,7 @@ static inline bool lim_is_fils_connection(struct pe_session *pe_session)
  *
  * Return: True, if successfully matches. False, otherwise
  */
-bool lim_verify_fils_params_assoc_rsp(tpAniSirGlobal mac_ctx,
+bool lim_verify_fils_params_assoc_rsp(struct mac_context *mac_ctx,
 				      struct pe_session *session_entry,
 				      tpSirAssocRsp assoc_rsp,
 				      tLimMlmAssocCnf * assoc_cnf);
@@ -210,7 +210,7 @@ bool lim_verify_fils_params_assoc_rsp(tpAniSirGlobal mac_ctx,
 void lim_update_fils_rik(struct pe_session *pe_session,
 			 tSirRoamOffloadScanReq *req_buffer);
 #else
-static inline bool lim_process_fils_auth_frame2(tpAniSirGlobal mac_ctx,
+static inline bool lim_process_fils_auth_frame2(struct mac_context *mac_ctx,
 		struct pe_session *pe_session, tSirMacAuthFrameBody *rx_auth_frm_body)
 {
 	return false;
@@ -225,7 +225,7 @@ lim_add_fils_data_to_auth_frame(struct pe_session *session, uint8_t *body)
 {
 }
 
-static inline bool lim_is_valid_fils_auth_frame(tpAniSirGlobal mac_ctx,
+static inline bool lim_is_valid_fils_auth_frame(struct mac_context *mac_ctx,
 	struct pe_session *pe_session, tSirMacAuthFrameBody *rx_auth_frm_body)
 {
 	return true;
@@ -235,7 +235,7 @@ static inline void
 lim_update_fils_config(struct pe_session *session, tpSirSmeJoinReq sme_join_req)
 { }
 
-static inline uint32_t lim_create_fils_auth_data(tpAniSirGlobal mac_ctx,
+static inline uint32_t lim_create_fils_auth_data(struct mac_context *mac_ctx,
 		tpSirMacAuthFrameBody auth_frame, struct pe_session *session)
 {
 	return 0;
@@ -246,12 +246,12 @@ static inline bool lim_is_fils_connection(struct pe_session *pe_session)
 	return false;
 }
 
-static inline void populate_fils_connect_params(tpAniSirGlobal mac_ctx,
+static inline void populate_fils_connect_params(struct mac_context *mac_ctx,
 						struct pe_session *session,
 						tpSirSmeJoinRsp sme_join_rsp)
 { }
 
-static inline QDF_STATUS aead_encrypt_assoc_req(tpAniSirGlobal mac_ctx,
+static inline QDF_STATUS aead_encrypt_assoc_req(struct mac_context *mac_ctx,
 						struct pe_session *pe_session,
 						uint8_t *frame,
 						uint32_t *payload)
@@ -259,7 +259,7 @@ static inline QDF_STATUS aead_encrypt_assoc_req(tpAniSirGlobal mac_ctx,
 	return QDF_STATUS_SUCCESS;
 }
 
-static inline QDF_STATUS aead_decrypt_assoc_rsp(tpAniSirGlobal mac_ctx,
+static inline QDF_STATUS aead_decrypt_assoc_rsp(struct mac_context *mac_ctx,
 				  struct pe_session *session,
 				  tDot11fAssocResponse *ar,
 				  uint8_t *p_frame, uint32_t *n_frame)
@@ -267,7 +267,7 @@ static inline QDF_STATUS aead_decrypt_assoc_rsp(tpAniSirGlobal mac_ctx,
 	return QDF_STATUS_SUCCESS;
 }
 
-static inline bool lim_verify_fils_params_assoc_rsp(tpAniSirGlobal mac_ctx,
+static inline bool lim_verify_fils_params_assoc_rsp(struct mac_context *mac_ctx,
 			struct pe_session *session_entry,
 			tpSirAssocRsp assoc_rsp,
 			tLimMlmAssocCnf *assoc_cnf)

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

@@ -43,7 +43,7 @@ typedef struct sPowersaveoffloadInfo {
 
 #ifdef WLAN_FEATURE_11W
 struct comeback_timer_info {
-	tpAniSirGlobal mac;
+	struct mac_context *mac;
 	uint8_t session_id;
 	tLimMlmStates lim_prev_mlm_state;  /* Previous MLM State */
 	tLimMlmStates lim_mlm_state;       /* MLM State */
@@ -478,7 +478,7 @@ struct pe_session {
 	qdf_mc_timer_t protection_fields_reset_timer;
 	/* timer to decrement CSA/ECSA count */
 	qdf_mc_timer_t ap_ecsa_timer;
-	tpAniSirGlobal mac_ctx;
+	struct mac_context *mac_ctx;
 	/*
 	 * variable to store state of various protection struct like
 	 * gLimOlbcParams, gLimOverlap11gParams, gLimOverlapHt20Params etc
@@ -614,7 +614,7 @@ static inline void pe_free_dph_node_array_buffer(void)
  *
  * Return: ptr to the session context or NULL if session can not be created.
  */
-struct pe_session *pe_create_session(tpAniSirGlobal mac,
+struct pe_session *pe_create_session(struct mac_context *mac,
 			      uint8_t *bssid,
 			      uint8_t *sessionId,
 			      uint16_t numSta, tSirBssType bssType,
@@ -632,7 +632,7 @@ struct pe_session *pe_create_session(tpAniSirGlobal mac,
  *
  * Return: pointer to the session context or NULL if session is not found.
  */
-struct pe_session *pe_find_session_by_bssid(tpAniSirGlobal mac, uint8_t *bssid,
+struct pe_session *pe_find_session_by_bssid(struct mac_context *mac, uint8_t *bssid,
 				     uint8_t *sessionId);
 
 /**
@@ -646,7 +646,7 @@ struct pe_session *pe_find_session_by_bssid(tpAniSirGlobal mac, uint8_t *bssid,
  *
  * Return: pointer to the session context or NULL if session is not found.
  */
-struct pe_session *pe_find_session_by_bss_idx(tpAniSirGlobal mac, uint8_t bssIdx);
+struct pe_session *pe_find_session_by_bss_idx(struct mac_context *mac, uint8_t bssIdx);
 
 /**
  * pe_find_session_by_peer_sta() - looks up the PE session given the Peer
@@ -662,7 +662,7 @@ struct pe_session *pe_find_session_by_bss_idx(tpAniSirGlobal mac, uint8_t bssIdx
  *
  * Return: pointer to the session context or NULL if session is not found.
  */
-struct pe_session *pe_find_session_by_peer_sta(tpAniSirGlobal mac, uint8_t *sa,
+struct pe_session *pe_find_session_by_peer_sta(struct mac_context *mac, uint8_t *sa,
 					uint8_t *sessionId);
 
 /**
@@ -677,7 +677,7 @@ struct pe_session *pe_find_session_by_peer_sta(tpAniSirGlobal mac, uint8_t *sa,
  *
  * Return: pointer to the session context or NULL if session is not found.
  */
-struct pe_session *pe_find_session_by_session_id(tpAniSirGlobal mac,
+struct pe_session *pe_find_session_by_session_id(struct mac_context *mac,
 					  uint8_t sessionId);
 
 /**
@@ -692,7 +692,7 @@ struct pe_session *pe_find_session_by_session_id(tpAniSirGlobal mac,
  *
  * Return: pointer to the session context or NULL if session is not found.
  */
-struct pe_session *pe_find_session_by_sta_id(tpAniSirGlobal mac, uint8_t staid,
+struct pe_session *pe_find_session_by_sta_id(struct mac_context *mac, uint8_t staid,
 				      uint8_t *sessionId);
 
 /**
@@ -703,7 +703,7 @@ struct pe_session *pe_find_session_by_sta_id(tpAniSirGlobal mac, uint8_t staid,
  *
  * Return: void
  */
-void pe_delete_session(tpAniSirGlobal mac, struct pe_session *pe_session);
+void pe_delete_session(struct mac_context *mac, struct pe_session *pe_session);
 
 
 /**
@@ -716,7 +716,7 @@ void pe_delete_session(tpAniSirGlobal mac, struct pe_session *pe_session);
  *
  * Return: pe session entry for given sme session if found else NULL
  */
-struct pe_session *pe_find_session_by_sme_session_id(tpAniSirGlobal mac_ctx,
+struct pe_session *pe_find_session_by_sme_session_id(struct mac_context *mac_ctx,
 					      uint8_t sme_session_id);
 
 /**
@@ -728,10 +728,10 @@ struct pe_session *pe_find_session_by_sme_session_id(tpAniSirGlobal mac_ctx,
  *
  * Return: pe session entry for given scan id if found else NULL
  */
-struct pe_session *pe_find_session_by_scan_id(tpAniSirGlobal mac_ctx,
+struct pe_session *pe_find_session_by_scan_id(struct mac_context *mac_ctx,
 				       uint32_t scan_id);
 
-uint8_t pe_get_active_session_count(tpAniSirGlobal mac_ctx);
+uint8_t pe_get_active_session_count(struct mac_context *mac_ctx);
 #ifdef WLAN_FEATURE_FILS_SK
 /**
  * pe_delete_fils_info: API to delete fils session info
@@ -755,7 +755,7 @@ void pe_delete_fils_info(struct pe_session *session);
  *
  * Return: None
  */
-void lim_set_bcn_probe_filter(tpAniSirGlobal mac_ctx,
+void lim_set_bcn_probe_filter(struct mac_context *mac_ctx,
 				struct pe_session *session,
 				tSirMacSSid *ibss_ssid,
 				uint8_t sap_channel);
@@ -768,7 +768,7 @@ void lim_set_bcn_probe_filter(tpAniSirGlobal mac_ctx,
  *
  * Return: None
  */
-void lim_reset_bcn_probe_filter(tpAniSirGlobal mac_ctx, struct pe_session *session);
+void lim_reset_bcn_probe_filter(struct mac_context *mac_ctx, struct pe_session *session);
 
 /**
  * lim_update_bcn_probe_filter - Update the beacon/probe filter in mac context
@@ -781,6 +781,6 @@ void lim_reset_bcn_probe_filter(tpAniSirGlobal mac_ctx, struct pe_session *sessi
  *
  * Return: None
  */
-void lim_update_bcn_probe_filter(tpAniSirGlobal mac_ctx, struct pe_session *session);
+void lim_update_bcn_probe_filter(struct mac_context *mac_ctx, struct pe_session *session);
 
 #endif /* #if !defined( __LIM_SESSION_H ) */

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

@@ -70,20 +70,20 @@ enum {
 	TRACE_CODE_INFO_LOG
 };
 
-void lim_trace_init(tpAniSirGlobal mac);
-void limTraceReset(tpAniSirGlobal mac);
-void limTraceUpdateMgmtStat(tpAniSirGlobal mac, uint8_t subtype);
-void lim_trace_dumpMgmtStat(tpAniSirGlobal mac, uint8_t subtype);
+void lim_trace_init(struct mac_context *mac);
+void limTraceReset(struct mac_context *mac);
+void limTraceUpdateMgmtStat(struct mac_context *mac, uint8_t subtype);
+void lim_trace_dumpMgmtStat(struct mac_context *mac, uint8_t subtype);
 uint8_t *lim_trace_get_mlm_state_string(uint32_t mlmState);
 uint8_t *lim_trace_get_sme_state_string(uint32_t smeState);
 void lim_trace_dump(void *mac, tp_qdf_trace_record pRecord,
 		    uint16_t recIndex);
-void mac_trace_msg_tx(tpAniSirGlobal mac, uint8_t session, uint32_t data);
-void mac_trace_msg_rx(tpAniSirGlobal mac, uint8_t session, uint32_t data);
+void mac_trace_msg_tx(struct mac_context *mac, uint8_t session, uint32_t data);
+void mac_trace_msg_rx(struct mac_context *mac, uint8_t session, uint32_t data);
 
-void mac_trace_msg_rx_new(tpAniSirGlobal mac, uint8_t module, uint8_t session,
+void mac_trace_msg_rx_new(struct mac_context *mac, uint8_t module, uint8_t session,
 			  uint32_t data);
-void mac_trace_msg_tx_new(tpAniSirGlobal mac, uint8_t module, uint8_t session,
+void mac_trace_msg_tx_new(struct mac_context *mac, uint8_t module, uint8_t session,
 			  uint32_t data);
 #endif /* endof LIM_TRACE_RECORD MACRO */
 

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

@@ -56,38 +56,38 @@
 /* local protos */
 
 static QDF_STATUS
-lim_calculate_svc_int(tpAniSirGlobal, tSirMacTspecIE *, uint32_t *);
+lim_calculate_svc_int(struct mac_context *, tSirMacTspecIE *, uint32_t *);
 static QDF_STATUS
-lim_validate_tspec_edca(tpAniSirGlobal, tSirMacTspecIE *, struct pe_session *);
+lim_validate_tspec_edca(struct mac_context *, tSirMacTspecIE *, struct pe_session *);
 static QDF_STATUS
-lim_validate_tspec(tpAniSirGlobal, tSirMacTspecIE *, struct pe_session *);
+lim_validate_tspec(struct mac_context *, tSirMacTspecIE *, struct pe_session *);
 static void
-lim_compute_mean_bw_used(tpAniSirGlobal, uint32_t *, uint32_t, tpLimTspecInfo,
+lim_compute_mean_bw_used(struct mac_context *, uint32_t *, uint32_t, tpLimTspecInfo,
 			 struct pe_session *);
-static void lim_get_available_bw(tpAniSirGlobal, uint32_t *, uint32_t *, uint32_t,
+static void lim_get_available_bw(struct mac_context *, uint32_t *, uint32_t *, uint32_t,
 				 uint32_t);
-static QDF_STATUS lim_admit_policy_oversubscription(tpAniSirGlobal,
+static QDF_STATUS lim_admit_policy_oversubscription(struct mac_context *,
 						       tSirMacTspecIE *,
 						       tpLimAdmitPolicyInfo,
 						       tpLimTspecInfo,
 						       struct pe_session *);
-static QDF_STATUS lim_tspec_find_by_sta_addr(tpAniSirGlobal, uint8_t *,
+static QDF_STATUS lim_tspec_find_by_sta_addr(struct mac_context *, uint8_t *,
 						tSirMacTspecIE *, tpLimTspecInfo,
 						tpLimTspecInfo *);
-static QDF_STATUS lim_validate_access_policy(tpAniSirGlobal, uint8_t, uint16_t,
+static QDF_STATUS lim_validate_access_policy(struct mac_context *, uint8_t, uint16_t,
 						struct pe_session *);
 
 /** -------------------------------------------------------------
    \fn lim_calculate_svc_int
    \brief TSPEC validation and servcie interval determination
-   \param     tpAniSirGlobal    mac
+   \param     struct mac_context *   mac
    \param         tSirMacTspecIE *pTspec
    \param         uint32_t            *pSvcInt
    \return QDF_STATUS - status of the comparison
    -------------------------------------------------------------*/
 
 static QDF_STATUS
-lim_calculate_svc_int(tpAniSirGlobal mac,
+lim_calculate_svc_int(struct mac_context *mac,
 		      tSirMacTspecIE *pTspec, uint32_t *pSvcInt)
 {
 	uint32_t msduSz, dataRate;
@@ -144,7 +144,7 @@ lim_calculate_svc_int(tpAniSirGlobal mac,
  * Return: Status
  **/
 static QDF_STATUS
-lim_validate_tspec_edca(tpAniSirGlobal mac_ctx,
+lim_validate_tspec_edca(struct mac_context *mac_ctx,
 			tSirMacTspecIE *tspec, struct pe_session *session_entry)
 {
 	uint32_t max_phy_rate, min_phy_rate;
@@ -174,13 +174,13 @@ lim_validate_tspec_edca(tpAniSirGlobal mac_ctx,
 /** -------------------------------------------------------------
    \fn lim_validate_tspec
    \brief validate the offered tspec
-   \param   tpAniSirGlobal mac
+   \param   struct mac_context *mac
    \param         tSirMacTspecIE *pTspec
    \return QDF_STATUS - status
    -------------------------------------------------------------*/
 
 static QDF_STATUS
-lim_validate_tspec(tpAniSirGlobal mac,
+lim_validate_tspec(struct mac_context *mac,
 		   tSirMacTspecIE *pTspec, struct pe_session *pe_session)
 {
 	QDF_STATUS retval = QDF_STATUS_SUCCESS;
@@ -210,7 +210,7 @@ lim_validate_tspec(tpAniSirGlobal mac,
 /** -------------------------------------------------------------
    \fn lim_compute_mean_bw_used
    \brief determime the used/allocated bandwidth
-   \param   tpAniSirGlobal mac
+   \param   struct mac_context *mac
    \param       uint32_t              *pBw
    \param       uint32_t               phyMode
    \param       tpLimTspecInfo    pTspecInfo
@@ -218,7 +218,7 @@ lim_validate_tspec(tpAniSirGlobal mac,
    -------------------------------------------------------------*/
 
 static void
-lim_compute_mean_bw_used(tpAniSirGlobal mac,
+lim_compute_mean_bw_used(struct mac_context *mac,
 			 uint32_t *pBw,
 			 uint32_t phyMode,
 			 tpLimTspecInfo pTspecInfo, struct pe_session *pe_session)
@@ -245,7 +245,7 @@ lim_compute_mean_bw_used(tpAniSirGlobal mac,
    \fn lim_get_available_bw
    \brief based on the phy mode and the bw_factor, determine the total bandwidth that
        can be supported
-   \param   tpAniSirGlobal mac
+   \param   struct mac_context *mac
    \param       uint32_t              *pMaxBw
    \param       uint32_t              *pMinBw
    \param       uint32_t               phyMode
@@ -254,7 +254,7 @@ lim_compute_mean_bw_used(tpAniSirGlobal mac,
    -------------------------------------------------------------*/
 
 static void
-lim_get_available_bw(tpAniSirGlobal mac,
+lim_get_available_bw(struct mac_context *mac,
 		     uint32_t *pMaxBw,
 		     uint32_t *pMinBw, uint32_t phyMode, uint32_t bw_factor)
 {
@@ -295,7 +295,7 @@ lim_get_available_bw(tpAniSirGlobal mac,
  * Return: Status
  **/
 static QDF_STATUS
-lim_admit_policy_oversubscription(tpAniSirGlobal mac_ctx,
+lim_admit_policy_oversubscription(struct mac_context *mac_ctx,
 				  tSirMacTspecIE *tspec,
 				  tpLimAdmitPolicyInfo admit_policy,
 				  tpLimTspecInfo tspec_info,
@@ -328,12 +328,12 @@ lim_admit_policy_oversubscription(tpAniSirGlobal mac_ctx,
 /** -------------------------------------------------------------
    \fn lim_admit_policy
    \brief determine the current admit control policy and apply it for the offered tspec
-   \param   tpAniSirGlobal mac
+   \param   struct mac_context *mac
    \param         tSirMacTspecIE   *pTspec
    \return QDF_STATUS - status
    -------------------------------------------------------------*/
 
-static QDF_STATUS lim_admit_policy(tpAniSirGlobal mac,
+static QDF_STATUS lim_admit_policy(struct mac_context *mac,
 				      tSirMacTspecIE *pTspec,
 				      struct pe_session *pe_session)
 {
@@ -371,14 +371,14 @@ static QDF_STATUS lim_admit_policy(tpAniSirGlobal mac,
 /** -------------------------------------------------------------
    \fn lim_tspec_delete
    \brief delete the specified tspec
-   \param   tpAniSirGlobal mac
+   \param   struct mac_context *mac
    \param     tpLimTspecInfo pInfo
    \return void
    -------------------------------------------------------------*/
 
 /* ----------------------------------------------------------------------------- */
 /* delete the specified tspec */
-static void lim_tspec_delete(tpAniSirGlobal mac, tpLimTspecInfo pInfo)
+static void lim_tspec_delete(struct mac_context *mac, tpLimTspecInfo pInfo)
 {
 	if (pInfo == NULL)
 		return;
@@ -392,7 +392,7 @@ static void lim_tspec_delete(tpAniSirGlobal mac, tpLimTspecInfo pInfo)
 /** -------------------------------------------------------------
    \fn lim_tspec_find_by_sta_addr
    \brief Send halMsg_AddTs to HAL
-   \param   tpAniSirGlobal mac
+   \param   struct mac_context *mac
    \param   \param       uint8_t               *pAddr
    \param       tSirMacTspecIE    *pTspecIE
    \param       tpLimTspecInfo    pTspecList
@@ -402,7 +402,7 @@ static void lim_tspec_delete(tpAniSirGlobal mac, tpLimTspecInfo pInfo)
 
 /* find the specified tspec in the list */
 static QDF_STATUS
-lim_tspec_find_by_sta_addr(tpAniSirGlobal mac,
+lim_tspec_find_by_sta_addr(struct mac_context *mac,
 			   uint8_t *pAddr,
 			   tSirMacTspecIE *pTspecIE,
 			   tpLimTspecInfo pTspecList, tpLimTspecInfo *ppInfo)
@@ -430,7 +430,7 @@ lim_tspec_find_by_sta_addr(tpAniSirGlobal mac,
 /** -------------------------------------------------------------
    \fn lim_tspec_find_by_assoc_id
    \brief find tspec with matchin staid and Tspec
-   \param   tpAniSirGlobal mac
+   \param   struct mac_context *mac
    \param       uint32_t               staid
    \param       tSirMacTspecIE    *pTspecIE
    \param       tpLimTspecInfo    pTspecList
@@ -439,7 +439,7 @@ lim_tspec_find_by_sta_addr(tpAniSirGlobal mac,
    -------------------------------------------------------------*/
 
 QDF_STATUS
-lim_tspec_find_by_assoc_id(tpAniSirGlobal mac,
+lim_tspec_find_by_assoc_id(struct mac_context *mac,
 			   uint16_t assocId,
 			   tSirMacTspecIE *pTspecIE,
 			   tpLimTspecInfo pTspecList, tpLimTspecInfo *ppInfo)
@@ -470,7 +470,7 @@ lim_tspec_find_by_assoc_id(tpAniSirGlobal mac,
    \fn lim_find_tspec
    \brief finding a TSPEC entry with assocId, tsinfo.direction and tsinfo.tsid
    \param    uint16_t               assocId
-   \param     tpAniSirGlobal    mac
+   \param     struct mac_context *   mac
    \param     tSirMacTSInfo   *pTsInfo
    \param         tpLimTspecInfo    pTspecList
    \param         tpLimTspecInfo   *ppInfo
@@ -478,7 +478,7 @@ lim_tspec_find_by_assoc_id(tpAniSirGlobal mac,
    -------------------------------------------------------------*/
 
 static QDF_STATUS
-lim_find_tspec(tpAniSirGlobal mac,
+lim_find_tspec(struct mac_context *mac,
 	       uint16_t assocId,
 	       tSirMacTSInfo *pTsInfo,
 	       tpLimTspecInfo pTspecList, tpLimTspecInfo *ppInfo)
@@ -507,7 +507,7 @@ lim_find_tspec(tpAniSirGlobal mac,
 /** -------------------------------------------------------------
    \fn lim_tspec_add
    \brief add or update the specified tspec to the tspec list
-   \param tpAniSirGlobal    mac
+   \param struct mac_context *   mac
    \param uint8_t               *pAddr
    \param uint16_t               assocId
    \param tSirMacTspecIE   *pTspec
@@ -517,7 +517,7 @@ lim_find_tspec(tpAniSirGlobal mac,
    \return QDF_STATUS - status of the comparison
    -------------------------------------------------------------*/
 
-QDF_STATUS lim_tspec_add(tpAniSirGlobal mac,
+QDF_STATUS lim_tspec_add(struct mac_context *mac,
 			    uint8_t *pAddr,
 			    uint16_t assocId,
 			    tSirMacTspecIE *pTspec,
@@ -596,14 +596,14 @@ QDF_STATUS lim_tspec_add(tpAniSirGlobal mac,
 /** -------------------------------------------------------------
    \fn lim_validate_access_policy
    \brief Validates Access policy
-   \param   tpAniSirGlobal mac
+   \param   struct mac_context *mac
    \param       uint8_t              accessPolicy
    \param       uint16_t             assocId
    \return QDF_STATUS - status
    -------------------------------------------------------------*/
 
 static QDF_STATUS
-lim_validate_access_policy(tpAniSirGlobal mac,
+lim_validate_access_policy(struct mac_context *mac,
 			   uint8_t accessPolicy,
 			   uint16_t assocId, struct pe_session *pe_session)
 {
@@ -655,7 +655,7 @@ lim_validate_access_policy(tpAniSirGlobal mac,
  *
  * Return: status
  **/
-QDF_STATUS lim_admit_control_add_ts(tpAniSirGlobal mac, uint8_t *pAddr,
+QDF_STATUS lim_admit_control_add_ts(struct mac_context *mac, uint8_t *pAddr,
 		tSirAddtsReqInfo *pAddts, tSirMacQosCapabilityStaIE *pQos,
 		uint16_t assocId, uint8_t alloc, tSirMacScheduleIE *pSch,
 		uint8_t *pTspecIdx, struct pe_session *pe_session)
@@ -744,7 +744,7 @@ QDF_STATUS lim_admit_control_add_ts(tpAniSirGlobal mac, uint8_t *pAddr,
 /** -------------------------------------------------------------
    \fn lim_admit_control_delete_ts
    \brief Delete the specified Tspec for the specified STA
-   \param   tpAniSirGlobal mac
+   \param   struct mac_context *mac
    \param       uint16_t               assocId
    \param       tSirMacTSInfo    *pTsInfo
    \param       uint8_t               *pTsStatus
@@ -753,7 +753,7 @@ QDF_STATUS lim_admit_control_add_ts(tpAniSirGlobal mac, uint8_t *pAddr,
    -------------------------------------------------------------*/
 
 QDF_STATUS
-lim_admit_control_delete_ts(tpAniSirGlobal mac,
+lim_admit_control_delete_ts(struct mac_context *mac,
 			    uint16_t assocId,
 			    tSirMacTSInfo *pTsInfo,
 			    uint8_t *pTsStatus, uint8_t *ptspecIdx)
@@ -780,12 +780,12 @@ lim_admit_control_delete_ts(tpAniSirGlobal mac,
 /** -------------------------------------------------------------
    \fn lim_admit_control_delete_sta
    \brief Delete all TSPEC for the specified STA
-   \param   tpAniSirGlobal mac
+   \param   struct mac_context *mac
    \param     uint16_t assocId
    \return QDF_STATUS - status
    -------------------------------------------------------------*/
 
-QDF_STATUS lim_admit_control_delete_sta(tpAniSirGlobal mac, uint16_t assocId)
+QDF_STATUS lim_admit_control_delete_sta(struct mac_context *mac, uint16_t assocId)
 {
 	tpLimTspecInfo pTspecInfo = &mac->lim.tspecInfo[0];
 	int ctspec;
@@ -805,10 +805,10 @@ QDF_STATUS lim_admit_control_delete_sta(tpAniSirGlobal mac, uint16_t assocId)
 /** -------------------------------------------------------------
    \fn lim_admit_control_init
    \brief init tspec table
-   \param   tpAniSirGlobal mac
+   \param   struct mac_context *mac
    \return QDF_STATUS - status
    -------------------------------------------------------------*/
-QDF_STATUS lim_admit_control_init(tpAniSirGlobal mac)
+QDF_STATUS lim_admit_control_init(struct mac_context *mac)
 {
 	qdf_mem_set(mac->lim.tspecInfo,
 		    LIM_NUM_TSPEC_MAX * sizeof(tLimTspecInfo), 0);
@@ -818,7 +818,7 @@ QDF_STATUS lim_admit_control_init(tpAniSirGlobal mac)
 /** -------------------------------------------------------------
    \fn lim_send_hal_msg_add_ts
    \brief Send halMsg_AddTs to HAL
-   \param   tpAniSirGlobal mac
+   \param   struct mac_context *mac
    \param     uint16_t        staIdx
    \param     uint8_t         tspecIdx
    \param       tSirMacTspecIE tspecIE
@@ -829,14 +829,14 @@ QDF_STATUS lim_admit_control_init(tpAniSirGlobal mac)
    -------------------------------------------------------------*/
 #ifdef FEATURE_WLAN_ESE
 QDF_STATUS
-lim_send_hal_msg_add_ts(tpAniSirGlobal mac,
+lim_send_hal_msg_add_ts(struct mac_context *mac,
 			uint16_t staIdx,
 			uint8_t tspecIdx,
 			tSirMacTspecIE tspecIE,
 			uint8_t sessionId, uint16_t tsm_interval)
 #else
 QDF_STATUS
-lim_send_hal_msg_add_ts(tpAniSirGlobal mac,
+lim_send_hal_msg_add_ts(struct mac_context *mac,
 			uint16_t staIdx,
 			uint8_t tspecIdx, tSirMacTspecIE tspecIE, uint8_t sessionId)
 #endif
@@ -893,7 +893,7 @@ lim_send_hal_msg_add_ts(tpAniSirGlobal mac,
 /** -------------------------------------------------------------
    \fn lim_send_hal_msg_del_ts
    \brief Send halMsg_AddTs to HAL
-   \param   tpAniSirGlobal mac
+   \param   struct mac_context *mac
    \param     uint16_t        staIdx
    \param     uint8_t         tspecIdx
    \param     tSirAddtsReqInfo addts
@@ -901,7 +901,7 @@ lim_send_hal_msg_add_ts(tpAniSirGlobal mac,
    -------------------------------------------------------------*/
 
 QDF_STATUS
-lim_send_hal_msg_del_ts(tpAniSirGlobal mac,
+lim_send_hal_msg_del_ts(struct mac_context *mac,
 			uint16_t staIdx,
 			uint8_t tspecIdx,
 			tSirDeltsReqInfo delts, uint8_t sessionId, uint8_t *bssId)
@@ -962,10 +962,10 @@ err:
  \       Otherwise, send DELTS action frame to peer and then
  \       then send back SME_ADDTS_RSP.
  \
-   \param  tpAniSirGlobal  mac
+   \param  struct mac_context * mac
    \param  struct scheduler_msg *limMsg
    -------------------------------------------------------------*/
-void lim_process_hal_add_ts_rsp(tpAniSirGlobal mac,
+void lim_process_hal_add_ts_rsp(struct mac_context *mac,
 				struct scheduler_msg *limMsg)
 {
 	tpAddTsParams pAddTsRspMsg = NULL;

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

@@ -53,7 +53,7 @@
  * Return: None
  */
 
-void lim_init_peer_idxpool(tpAniSirGlobal mac, struct pe_session *pe_session)
+void lim_init_peer_idxpool(struct mac_context *mac, struct pe_session *pe_session)
 {
 	uint8_t i;
 	uint8_t maxAssocSta = mac->lim.maxStation;
@@ -109,7 +109,7 @@ void lim_init_peer_idxpool(tpAniSirGlobal mac, struct pe_session *pe_session)
  * @return peerIdx  - assigned peer Station IDx for STA
  */
 
-uint16_t lim_assign_peer_idx(tpAniSirGlobal mac, struct pe_session *pe_session)
+uint16_t lim_assign_peer_idx(struct mac_context *mac, struct pe_session *pe_session)
 {
 	uint16_t peerId;
 
@@ -159,7 +159,7 @@ uint16_t lim_assign_peer_idx(tpAniSirGlobal mac, struct pe_session *pe_session)
  */
 
 void
-lim_release_peer_idx(tpAniSirGlobal mac, uint16_t peerIdx,
+lim_release_peer_idx(struct mac_context *mac, uint16_t peerIdx,
 		     struct pe_session *pe_session)
 {
 	pe_session->gLimNumOfCurrentSTAs--;

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

@@ -102,7 +102,7 @@ uint32_t lim_cmp_ssid(tSirMacSSid *rx_ssid, struct pe_session *session_entry)
  */
 
 uint8_t
-lim_compare_capabilities(tpAniSirGlobal mac,
+lim_compare_capabilities(struct mac_context *mac,
 			 tSirAssocReq *pAssocReq,
 			 tSirMacCapabilityInfo *pLocalCapabs,
 			 struct pe_session *pe_session)
@@ -181,7 +181,7 @@ lim_compare_capabilities(tpAniSirGlobal mac,
  */
 
 uint8_t
-lim_check_rx_basic_rates(tpAniSirGlobal mac, tSirMacRateSet rxRateSet,
+lim_check_rx_basic_rates(struct mac_context *mac, tSirMacRateSet rxRateSet,
 			 struct pe_session *pe_session)
 {
 	tSirMacRateSet *pRateSet, basicRate;
@@ -255,7 +255,7 @@ lim_check_rx_basic_rates(tpAniSirGlobal mac, tSirMacRateSet rxRateSet,
  *                  received rateset else false.
  */
 
-uint8_t lim_check_mcs_set(tpAniSirGlobal mac, uint8_t *supportedMCSSet)
+uint8_t lim_check_mcs_set(struct mac_context *mac, uint8_t *supportedMCSSet)
 {
 	uint8_t basicMCSSet[SIZE_OF_BASIC_MCS_SET] = { 0 };
 	qdf_size_t cfg_len = 0;
@@ -338,7 +338,7 @@ static inline bool is_non_rsn_cipher(uint8_t cipher_suite)
  *                  received rsn IE else failure status.
  */
 
-uint8_t lim_check_rx_rsn_ie_match(tpAniSirGlobal mac_ctx,
+uint8_t lim_check_rx_rsn_ie_match(struct mac_context *mac_ctx,
 				  tDot11fIERSN * const rx_rsn_ie,
 				  struct pe_session *session_entry, uint8_t sta_is_ht,
 				  bool *pmf_connection)
@@ -456,7 +456,7 @@ uint8_t lim_check_rx_rsn_ie_match(tpAniSirGlobal mac_ctx,
  */
 
 uint8_t
-lim_check_rx_wpa_ie_match(tpAniSirGlobal mac, tDot11fIEWPA *rx_wpaie,
+lim_check_rx_wpa_ie_match(struct mac_context *mac, tDot11fIEWPA *rx_wpaie,
 			  struct pe_session *session_entry, uint8_t sta_is_ht)
 {
 	tDot11fIEWPA *wpa_ie;
@@ -546,7 +546,7 @@ lim_check_rx_wpa_ie_match(tpAniSirGlobal mac, tDot11fIEWPA *rx_wpaie,
  */
 
 QDF_STATUS
-lim_cleanup_rx_path(tpAniSirGlobal mac, tpDphHashNode pStaDs,
+lim_cleanup_rx_path(struct mac_context *mac, tpDphHashNode pStaDs,
 		    struct pe_session *pe_session)
 {
 	QDF_STATUS retCode = QDF_STATUS_SUCCESS;
@@ -645,7 +645,7 @@ lim_cleanup_rx_path(tpAniSirGlobal mac, tpDphHashNode pStaDs,
  * Return: None
  */
 void
-lim_send_del_sta_cnf(tpAniSirGlobal mac, struct qdf_mac_addr sta_dsaddr,
+lim_send_del_sta_cnf(struct mac_context *mac, struct qdf_mac_addr sta_dsaddr,
 		     uint16_t staDsAssocId, tLimMlmStaContext mlmStaContext,
 		     tSirResultCodes statusCode, struct pe_session *pe_session)
 {
@@ -850,7 +850,7 @@ lim_send_del_sta_cnf(tpAniSirGlobal mac, struct qdf_mac_addr sta_dsaddr,
  */
 
 void
-lim_reject_association(tpAniSirGlobal mac_ctx, tSirMacAddr peer_addr,
+lim_reject_association(struct mac_context *mac_ctx, tSirMacAddr peer_addr,
 			uint8_t sub_type, uint8_t add_pre_auth_context,
 			tAniAuthType auth_type, uint16_t sta_id,
 			uint8_t delete_sta, enum eSirMacStatusCodes result_code,
@@ -948,7 +948,7 @@ lim_reject_association(tpAniSirGlobal mac_ctx, tSirMacAddr peer_addr,
  * Return: none
  */
 static void
-lim_decide_ap_protection_on_ht20_delete(tpAniSirGlobal mac_ctx,
+lim_decide_ap_protection_on_ht20_delete(struct mac_context *mac_ctx,
 					tpDphHashNode sta_ds,
 					tpUpdateBeaconParams beacon_params,
 					struct pe_session *session_entry)
@@ -995,7 +995,7 @@ lim_decide_ap_protection_on_ht20_delete(tpAniSirGlobal mac_ctx,
  * Return: none
  */
 void
-lim_decide_ap_protection_on_delete(tpAniSirGlobal mac_ctx,
+lim_decide_ap_protection_on_delete(struct mac_context *mac_ctx,
 				   tpDphHashNode sta_ds,
 				   tpUpdateBeaconParams beacon_params,
 				   struct pe_session *session_entry)
@@ -1180,7 +1180,7 @@ lim_decide_ap_protection_on_delete(tpAniSirGlobal mac_ctx,
  *
  * Return: None
  */
-static void lim_decide_short_preamble(tpAniSirGlobal mac_ctx,
+static void lim_decide_short_preamble(struct mac_context *mac_ctx,
 				      tpDphHashNode sta_ds,
 				      tpUpdateBeaconParams beacon_params,
 				      struct pe_session *session_entry)
@@ -1234,7 +1234,7 @@ static void lim_decide_short_preamble(tpAniSirGlobal mac_ctx,
  * Return: None
  */
 static void
-lim_decide_short_slot(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
+lim_decide_short_slot(struct mac_context *mac_ctx, tpDphHashNode sta_ds,
 		      tpUpdateBeaconParams beacon_params,
 		      struct pe_session *session_entry)
 {
@@ -1332,7 +1332,7 @@ lim_decide_short_slot(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
  *
  * Return: QDF_STATUS_SUCCESS on success else QDF_STATUS_E_FAILURE
  */
-QDF_STATUS lim_populate_vht_mcs_set(tpAniSirGlobal mac_ctx,
+QDF_STATUS lim_populate_vht_mcs_set(struct mac_context *mac_ctx,
 				       tpSirSupportedRates rates,
 				       tDot11fIEVHTCaps *peer_vht_caps,
 				       struct pe_session *session_entry,
@@ -1477,7 +1477,7 @@ QDF_STATUS lim_populate_vht_mcs_set(tpAniSirGlobal mac_ctx,
  * Return: QDF_STATUS_SUCCESS or QDF_STATUS_E_FAILURE.
  */
 QDF_STATUS
-lim_populate_own_rate_set(tpAniSirGlobal mac_ctx,
+lim_populate_own_rate_set(struct mac_context *mac_ctx,
 		tpSirSupportedRates rates, uint8_t *supported_mcs_set,
 		uint8_t basic_only, struct pe_session *session_entry,
 		struct sDot11fIEVHTCaps *vht_caps,
@@ -1627,7 +1627,7 @@ static void lim_calculate_he_nss(tpSirSupportedRates rates, struct pe_session *s
 #endif
 
 QDF_STATUS
-lim_populate_peer_rate_set(tpAniSirGlobal mac,
+lim_populate_peer_rate_set(struct mac_context *mac,
 		tpSirSupportedRates pRates, uint8_t *pSupportedMCSSet,
 		uint8_t basicOnly, struct pe_session *pe_session,
 		tDot11fIEVHTCaps *pVHTCaps, tDot11fIEhe_cap *he_caps)
@@ -1810,7 +1810,7 @@ lim_populate_peer_rate_set(tpAniSirGlobal mac,
  *
  * Return: QDF_STATUS_SUCCESS on success else QDF_STATUS_E_FAILURE
  */
-QDF_STATUS lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx,
+QDF_STATUS lim_populate_matching_rate_set(struct mac_context *mac_ctx,
 					     tpDphHashNode sta_ds,
 					     tSirMacRateSet *oper_rate_set,
 					     tSirMacRateSet *ext_rate_set,
@@ -2106,7 +2106,7 @@ static void lim_update_he_stbc_capable(tpAddStaParams add_sta_params)
  */
 
 QDF_STATUS
-lim_add_sta(tpAniSirGlobal mac_ctx,
+lim_add_sta(struct mac_context *mac_ctx,
 	tpDphHashNode sta_ds, uint8_t update_entry, struct pe_session *session_entry)
 {
 	tpAddStaParams add_sta_params = NULL;
@@ -2562,7 +2562,7 @@ lim_add_sta(tpAniSirGlobal mac_ctx,
  */
 
 QDF_STATUS
-lim_del_sta(tpAniSirGlobal mac,
+lim_del_sta(struct mac_context *mac,
 	    tpDphHashNode pStaDs, bool fRespReqd, struct pe_session *pe_session)
 {
 	tpDeleteStaParams pDelStaParams = NULL;
@@ -2707,7 +2707,7 @@ lim_del_sta(tpAniSirGlobal mac,
  */
 
 QDF_STATUS
-lim_add_sta_self(tpAniSirGlobal mac, uint16_t staIdx, uint8_t updateSta,
+lim_add_sta_self(struct mac_context *mac, uint16_t staIdx, uint8_t updateSta,
 		 struct pe_session *pe_session)
 {
 	tpAddStaParams pAddStaParams = NULL;
@@ -2932,7 +2932,7 @@ lim_add_sta_self(tpAniSirGlobal mac, uint16_t staIdx, uint8_t updateSta,
  * @return None
  */
 
-void lim_teardown_infra_bss(tpAniSirGlobal mac, struct pe_session *pe_session)
+void lim_teardown_infra_bss(struct mac_context *mac, struct pe_session *pe_session)
 {
 	tSirMacAddr bcAddr = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
 
@@ -2963,7 +2963,7 @@ void lim_teardown_infra_bss(tpAniSirGlobal mac, struct pe_session *pe_session)
  * @return None
  */
 
-void lim_handle_cnf_wait_timeout(tpAniSirGlobal mac, uint16_t staId)
+void lim_handle_cnf_wait_timeout(struct mac_context *mac, uint16_t staId)
 {
 	tpDphHashNode pStaDs;
 	struct pe_session *pe_session = NULL;
@@ -3018,7 +3018,7 @@ void lim_handle_cnf_wait_timeout(tpAniSirGlobal mac, uint16_t staId)
  */
 
 void
-lim_delete_dph_hash_entry(tpAniSirGlobal mac_ctx, tSirMacAddr sta_addr,
+lim_delete_dph_hash_entry(struct mac_context *mac_ctx, tSirMacAddr sta_addr,
 				 uint16_t sta_id, struct pe_session *session_entry)
 {
 	uint16_t aid;
@@ -3123,7 +3123,7 @@ lim_delete_dph_hash_entry(tpAniSirGlobal mac_ctx, tSirMacAddr sta_addr,
  */
 
 void
-lim_check_and_announce_join_success(tpAniSirGlobal mac_ctx,
+lim_check_and_announce_join_success(struct mac_context *mac_ctx,
 		tSirProbeRespBeacon *beacon_probe_rsp, tpSirMacMgmtHdr header,
 		struct pe_session *session_entry)
 {
@@ -3315,7 +3315,7 @@ lim_check_and_announce_join_success(tpAniSirGlobal mac_ctx,
  *                       populated
  * @return  status       A status reporting QDF_STATUS_SUCCESS or QDF_STATUS_E_FAILURE
  */
-QDF_STATUS lim_extract_ap_capabilities(tpAniSirGlobal mac,
+QDF_STATUS lim_extract_ap_capabilities(struct mac_context *mac,
 					  uint8_t *pIE,
 					  uint16_t ieLen,
 					  tpSirProbeRespBeacon beaconStruct)
@@ -3360,7 +3360,7 @@ QDF_STATUS lim_extract_ap_capabilities(tpAniSirGlobal mac,
  */
 
 QDF_STATUS
-lim_del_bss(tpAniSirGlobal mac, tpDphHashNode pStaDs, uint16_t bssIdx,
+lim_del_bss(struct mac_context *mac, tpDphHashNode pStaDs, uint16_t bssIdx,
 	    struct pe_session *pe_session)
 {
 	tpDeleteBssParams pDelBssParams = NULL;
@@ -3436,7 +3436,7 @@ lim_del_bss(tpAniSirGlobal mac, tpDphHashNode pStaDs, uint16_t bssIdx,
  *
  * Return : void
  */
-static void lim_update_vhtcaps_assoc_resp(tpAniSirGlobal mac_ctx,
+static void lim_update_vhtcaps_assoc_resp(struct mac_context *mac_ctx,
 		tpAddBssParams pAddBssParams,
 		tDot11fIEVHTCaps *vht_caps, struct pe_session *pe_session)
 {
@@ -3498,7 +3498,7 @@ static void lim_update_vhtcaps_assoc_resp(tpAniSirGlobal mac_ctx,
  *
  * Return : void
  */
-static void lim_update_vht_oper_assoc_resp(tpAniSirGlobal mac_ctx,
+static void lim_update_vht_oper_assoc_resp(struct mac_context *mac_ctx,
 		tpAddBssParams pAddBssParams,
 		tDot11fIEVHTOperation *vht_oper, struct pe_session *pe_session)
 {
@@ -3562,7 +3562,7 @@ static inline void lim_set_sta_ctx_twt(tAddStaParams *sta_ctx,
  * @return None
  */
 
-QDF_STATUS lim_sta_send_add_bss(tpAniSirGlobal mac, tpSirAssocRsp pAssocRsp,
+QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp,
 				   tpSchBeaconStruct pBeaconStruct,
 				   tpSirBssDescription bssDescription,
 				   uint8_t updateEntry, struct pe_session *pe_session)
@@ -4097,7 +4097,7 @@ returnFailure:
 	return retCode;
 }
 
-QDF_STATUS lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal mac, uint8_t updateEntry,
+QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac, uint8_t updateEntry,
 					     struct pe_session *pe_session)
 {
 	struct scheduler_msg msgQ = {0};
@@ -4594,7 +4594,7 @@ returnFailure:
  * Return: void
  */
 void
-lim_prepare_and_send_del_sta_cnf(tpAniSirGlobal mac, tpDphHashNode pStaDs,
+lim_prepare_and_send_del_sta_cnf(struct mac_context *mac, tpDphHashNode pStaDs,
 				 tSirResultCodes statusCode,
 				 struct pe_session *pe_session)
 {
@@ -4631,11 +4631,11 @@ lim_prepare_and_send_del_sta_cnf(tpAniSirGlobal mac, tpDphHashNode pStaDs,
    \fn lim_init_pre_auth_timer_table
    \brief Initialize the Pre Auth Tanle and creates the timer for
        each node for the timeout value got from cfg.
-   \param     tpAniSirGlobal    mac
+   \param     struct mac_context *   mac
    \param     tpLimPreAuthTable pPreAuthTimerTable
    \return none
    -------------------------------------------------------------*/
-void lim_init_pre_auth_timer_table(tpAniSirGlobal mac,
+void lim_init_pre_auth_timer_table(struct mac_context *mac,
 				   tpLimPreAuthTable pPreAuthTimerTable)
 {
 	uint32_t cfgValue;
@@ -4663,11 +4663,11 @@ void lim_init_pre_auth_timer_table(tpAniSirGlobal mac,
 /** -------------------------------------------------------------
    \fn lim_acquire_free_pre_auth_node
    \brief Retrives a free Pre Auth node from Pre Auth Table.
-   \param     tpAniSirGlobal    mac
+   \param     struct mac_context *   mac
    \param     tpLimPreAuthTable pPreAuthTimerTable
    \return none
    -------------------------------------------------------------*/
-tLimPreAuthNode *lim_acquire_free_pre_auth_node(tpAniSirGlobal mac,
+tLimPreAuthNode *lim_acquire_free_pre_auth_node(struct mac_context *mac,
 						tpLimPreAuthTable pPreAuthTimerTable)
 {
 	uint32_t i;
@@ -4686,12 +4686,12 @@ tLimPreAuthNode *lim_acquire_free_pre_auth_node(tpAniSirGlobal mac,
 /** -------------------------------------------------------------
    \fn lim_get_pre_auth_node_from_index
    \brief Depending on the Index this retrieves the pre auth node.
-   \param     tpAniSirGlobal    mac
+   \param     struct mac_context *   mac
    \param     tpLimPreAuthTable pAuthTable
    \param     uint32_t authNodeIdx
    \return none
    -------------------------------------------------------------*/
-tLimPreAuthNode *lim_get_pre_auth_node_from_index(tpAniSirGlobal mac,
+tLimPreAuthNode *lim_get_pre_auth_node_from_index(struct mac_context *mac,
 						  tpLimPreAuthTable pAuthTable,
 						  uint32_t authNodeIdx)
 {
@@ -4706,7 +4706,7 @@ tLimPreAuthNode *lim_get_pre_auth_node_from_index(tpAniSirGlobal mac,
 }
 
 /* Util API to check if the channels supported by STA is within range */
-QDF_STATUS lim_is_dot11h_supported_channels_valid(tpAniSirGlobal mac,
+QDF_STATUS lim_is_dot11h_supported_channels_valid(struct mac_context *mac,
 						     tSirAssocReq *assoc)
 {
 	/*
@@ -4720,7 +4720,7 @@ QDF_STATUS lim_is_dot11h_supported_channels_valid(tpAniSirGlobal mac,
 }
 
 /* Util API to check if the txpower supported by STA is within range */
-QDF_STATUS lim_is_dot11h_power_capabilities_in_range(tpAniSirGlobal mac,
+QDF_STATUS lim_is_dot11h_power_capabilities_in_range(struct mac_context *mac,
 							tSirAssocReq *assoc,
 							struct pe_session *pe_session)
 {
@@ -4756,12 +4756,12 @@ QDF_STATUS lim_is_dot11h_power_capabilities_in_range(tpAniSirGlobal mac,
    \fn     lim_fill_rx_highest_supported_rate
    \brief  Fills in the Rx Highest Supported Data Rate field from
  \       the 'supported MCS set' field in HT capability element.
-   \param  tpAniSirGlobal    mac
+   \param  struct mac_context *   mac
    \param  tpSirSupportedRates  pRates
    \param  uint8_t*  pSupportedMCSSet
    \return none
    -------------------------------------------------------------*/
-void lim_fill_rx_highest_supported_rate(tpAniSirGlobal mac,
+void lim_fill_rx_highest_supported_rate(struct mac_context *mac,
 					uint16_t *rxHighestRate,
 					uint8_t *pSupportedMCSSet)
 {
@@ -4782,14 +4782,14 @@ void lim_fill_rx_highest_supported_rate(tpAniSirGlobal mac,
 /** -------------------------------------------------------------
    \fn     lim_send_sme_unprotected_mgmt_frame_ind
    \brief  Forwards the unprotected management frame to SME.
-   \param  tpAniSirGlobal    mac
+   \param  struct mac_context *   mac
    \param  frameType - 802.11 frame type
    \param  frame - frame buffer
    \param  sessionId - id for the current session
    \param  pe_session - PE session context
    \return none
    -------------------------------------------------------------*/
-void lim_send_sme_unprotected_mgmt_frame_ind(tpAniSirGlobal mac, uint8_t frameType,
+void lim_send_sme_unprotected_mgmt_frame_ind(struct mac_context *mac, uint8_t frameType,
 					     uint8_t *frame, uint32_t frameLen,
 					     uint16_t sessionId,
 					     struct pe_session *pe_session)
@@ -4823,14 +4823,14 @@ void lim_send_sme_unprotected_mgmt_frame_ind(tpAniSirGlobal mac, uint8_t frameTy
 /** -------------------------------------------------------------
    \fn     lim_send_sme_tsm_ie_ind
    \brief  Forwards the TSM IE information to SME.
-   \param  tpAniSirGlobal    mac
+   \param  struct mac_context *   mac
    \param  pe_session - PE session context
    \param  tid - traffic id
    \param  state - tsm state (enabled/disabled)
    \param  measurementInterval - measurement interval
    \return none
    -------------------------------------------------------------*/
-void lim_send_sme_tsm_ie_ind(tpAniSirGlobal mac, struct pe_session *pe_session,
+void lim_send_sme_tsm_ie_ind(struct mac_context *mac, struct pe_session *pe_session,
 			     uint8_t tid, uint8_t state, uint16_t measInterval)
 {
 	struct scheduler_msg mmhMsg = {0};

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

@@ -40,25 +40,25 @@
 #define MAX_NOA_PERIOD_IN_MICROSECS 3000000
 
 uint32_t lim_cmp_ssid(tSirMacSSid *, struct pe_session *);
-uint8_t lim_compare_capabilities(tpAniSirGlobal,
+uint8_t lim_compare_capabilities(struct mac_context *,
 				 tSirAssocReq *,
 				 tSirMacCapabilityInfo *, struct pe_session *);
-uint8_t lim_check_rx_basic_rates(tpAniSirGlobal, tSirMacRateSet, struct pe_session *);
-uint8_t lim_check_rx_rsn_ie_match(tpAniSirGlobal mac_ctx,
+uint8_t lim_check_rx_basic_rates(struct mac_context *, tSirMacRateSet, struct pe_session *);
+uint8_t lim_check_rx_rsn_ie_match(struct mac_context *mac_ctx,
 				  tDot11fIERSN * const rx_rsn_ie,
 				  struct pe_session *session_entry, uint8_t sta_is_ht,
 				  bool *pmf_connection);
-uint8_t lim_check_rx_wpa_ie_match(tpAniSirGlobal, tDot11fIEWPA *, struct pe_session *,
+uint8_t lim_check_rx_wpa_ie_match(struct mac_context *, tDot11fIEWPA *, struct pe_session *,
 				  uint8_t);
-uint8_t lim_check_mcs_set(tpAniSirGlobal mac, uint8_t *supportedMCSSet);
-void limPostDummyToTmRing(tpAniSirGlobal, tpDphHashNode);
-void limPostPacketToTdRing(tpAniSirGlobal, tpDphHashNode, uint8_t);
-QDF_STATUS lim_cleanup_rx_path(tpAniSirGlobal, tpDphHashNode, struct pe_session *);
-void lim_reject_association(tpAniSirGlobal, tSirMacAddr, uint8_t,
+uint8_t lim_check_mcs_set(struct mac_context *mac, uint8_t *supportedMCSSet);
+void limPostDummyToTmRing(struct mac_context *, tpDphHashNode);
+void limPostPacketToTdRing(struct mac_context *, tpDphHashNode, uint8_t);
+QDF_STATUS lim_cleanup_rx_path(struct mac_context *, tpDphHashNode, struct pe_session *);
+void lim_reject_association(struct mac_context *, tSirMacAddr, uint8_t,
 			    uint8_t, tAniAuthType, uint16_t, uint8_t,
 			    enum eSirMacStatusCodes, struct pe_session *);
 
-QDF_STATUS lim_populate_peer_rate_set(tpAniSirGlobal mac,
+QDF_STATUS lim_populate_peer_rate_set(struct mac_context *mac,
 					 tpSirSupportedRates pRates,
 					 uint8_t *pSupportedMCSSet,
 					 uint8_t basicOnly,
@@ -66,7 +66,7 @@ QDF_STATUS lim_populate_peer_rate_set(tpAniSirGlobal mac,
 					 tDot11fIEVHTCaps *pVHTCaps,
 					 tDot11fIEhe_cap *he_caps);
 
-QDF_STATUS lim_populate_own_rate_set(tpAniSirGlobal mac,
+QDF_STATUS lim_populate_own_rate_set(struct mac_context *mac,
 					tpSirSupportedRates pRates,
 					uint8_t *pSupportedMCSSet,
 					uint8_t basicOnly,
@@ -75,7 +75,7 @@ QDF_STATUS lim_populate_own_rate_set(tpAniSirGlobal mac,
 					tDot11fIEhe_cap *he_caps);
 
 QDF_STATUS
-lim_populate_matching_rate_set(tpAniSirGlobal mac,
+lim_populate_matching_rate_set(struct mac_context *mac,
 			       tpDphHashNode pStaDs,
 			       tSirMacRateSet *pOperRateSet,
 			       tSirMacRateSet *pExtRateSet,
@@ -84,51 +84,51 @@ lim_populate_matching_rate_set(tpAniSirGlobal mac,
 			       tDot11fIEVHTCaps *pVHTCaps,
 			       tDot11fIEhe_cap *he_caps);
 
-QDF_STATUS lim_add_sta(tpAniSirGlobal, tpDphHashNode, uint8_t, struct pe_session *);
-QDF_STATUS lim_del_bss(tpAniSirGlobal, tpDphHashNode, uint16_t, struct pe_session *);
-QDF_STATUS lim_del_sta(tpAniSirGlobal, tpDphHashNode, bool, struct pe_session *);
-QDF_STATUS lim_add_sta_self(tpAniSirGlobal, uint16_t, uint8_t, struct pe_session *);
+QDF_STATUS lim_add_sta(struct mac_context *, tpDphHashNode, uint8_t, struct pe_session *);
+QDF_STATUS lim_del_bss(struct mac_context *, tpDphHashNode, uint16_t, struct pe_session *);
+QDF_STATUS lim_del_sta(struct mac_context *, tpDphHashNode, bool, struct pe_session *);
+QDF_STATUS lim_add_sta_self(struct mac_context *, uint16_t, uint8_t, struct pe_session *);
 
-void lim_teardown_infra_bss(tpAniSirGlobal, struct pe_session *);
+void lim_teardown_infra_bss(struct mac_context *, struct pe_session *);
 #ifdef WLAN_FEATURE_HOST_ROAM
-void lim_restore_pre_reassoc_state(tpAniSirGlobal,
+void lim_restore_pre_reassoc_state(struct mac_context *,
 				   tSirResultCodes, uint16_t, struct pe_session *);
-void lim_post_reassoc_failure(tpAniSirGlobal,
+void lim_post_reassoc_failure(struct mac_context *,
 			      tSirResultCodes, uint16_t, struct pe_session *);
-bool lim_is_reassoc_in_progress(tpAniSirGlobal, struct pe_session *);
+bool lim_is_reassoc_in_progress(struct mac_context *, struct pe_session *);
 
-void lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal mac,
+void lim_handle_add_bss_in_re_assoc_context(struct mac_context *mac,
 		tpDphHashNode pStaDs, struct pe_session *pe_session);
-void lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal mac,
+void lim_handle_del_bss_in_re_assoc_context(struct mac_context *mac,
 		   tpDphHashNode pStaDs, struct pe_session *pe_session);
-void lim_send_retry_reassoc_req_frame(tpAniSirGlobal mac,
+void lim_send_retry_reassoc_req_frame(struct mac_context *mac,
 	      tLimMlmReassocReq *pMlmReassocReq, struct pe_session *pe_session);
-QDF_STATUS lim_add_ft_sta_self(tpAniSirGlobal mac, uint16_t assocId,
+QDF_STATUS lim_add_ft_sta_self(struct mac_context *mac, uint16_t assocId,
 				  struct pe_session *pe_session);
 #else
-static inline void lim_restore_pre_reassoc_state(tpAniSirGlobal mac_ctx,
+static inline void lim_restore_pre_reassoc_state(struct mac_context *mac_ctx,
 			tSirResultCodes res_code, uint16_t prot_status,
 			struct pe_session *pe_session)
 {}
-static inline void lim_post_reassoc_failure(tpAniSirGlobal mac_ctx,
+static inline void lim_post_reassoc_failure(struct mac_context *mac_ctx,
 			      tSirResultCodes res_code, uint16_t prot_status,
 			      struct pe_session *pe_session)
 {}
-static inline void lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal mac,
+static inline void lim_handle_add_bss_in_re_assoc_context(struct mac_context *mac,
 		tpDphHashNode pStaDs, struct pe_session *pe_session)
 {}
-static inline void lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal mac,
+static inline void lim_handle_del_bss_in_re_assoc_context(struct mac_context *mac,
 		   tpDphHashNode pStaDs, struct pe_session *pe_session)
 {}
-static inline void lim_send_retry_reassoc_req_frame(tpAniSirGlobal mac,
+static inline void lim_send_retry_reassoc_req_frame(struct mac_context *mac,
 	      tLimMlmReassocReq *pMlmReassocReq, struct pe_session *pe_session)
 {}
-static inline bool lim_is_reassoc_in_progress(tpAniSirGlobal mac_ctx,
+static inline bool lim_is_reassoc_in_progress(struct mac_context *mac_ctx,
 		struct pe_session *pe_session)
 {
 	return false;
 }
-static inline QDF_STATUS lim_add_ft_sta_self(tpAniSirGlobal mac,
+static inline QDF_STATUS lim_add_ft_sta_self(struct mac_context *mac,
 		uint16_t assocId, struct pe_session *pe_session)
 {
 	return QDF_STATUS_SUCCESS;
@@ -148,74 +148,74 @@ static inline bool lim_is_roam_synch_in_progress(struct pe_session *pe_session)
 #endif
 
 void
-lim_send_del_sta_cnf(tpAniSirGlobal mac, struct qdf_mac_addr sta_dsaddr,
+lim_send_del_sta_cnf(struct mac_context *mac, struct qdf_mac_addr sta_dsaddr,
 		     uint16_t staDsAssocId, tLimMlmStaContext mlmStaContext,
 		     tSirResultCodes statusCode, struct pe_session *pe_session);
 
-void lim_handle_cnf_wait_timeout(tpAniSirGlobal mac, uint16_t staId);
-void lim_delete_dph_hash_entry(tpAniSirGlobal, tSirMacAddr, uint16_t, struct pe_session *);
-void lim_check_and_announce_join_success(tpAniSirGlobal,
+void lim_handle_cnf_wait_timeout(struct mac_context *mac, uint16_t staId);
+void lim_delete_dph_hash_entry(struct mac_context *, tSirMacAddr, uint16_t, struct pe_session *);
+void lim_check_and_announce_join_success(struct mac_context *,
 					 tSirProbeRespBeacon *,
 					 tpSirMacMgmtHdr, struct pe_session *);
-void lim_update_re_assoc_globals(tpAniSirGlobal mac,
+void lim_update_re_assoc_globals(struct mac_context *mac,
 				 tpSirAssocRsp pAssocRsp,
 				 struct pe_session *pe_session);
 
-void lim_update_assoc_sta_datas(tpAniSirGlobal mac,
+void lim_update_assoc_sta_datas(struct mac_context *mac,
 				tpDphHashNode pStaDs, tpSirAssocRsp pAssocRsp,
 				struct pe_session *pe_session);
 
-QDF_STATUS lim_sta_send_add_bss(tpAniSirGlobal mac, tpSirAssocRsp pAssocRsp,
+QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp,
 				   tpSchBeaconStruct pBeaconStruct,
 				   tpSirBssDescription bssDescription,
 				   uint8_t updateEntry, struct pe_session *pe_session);
-QDF_STATUS lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal mac, uint8_t updateEntry,
+QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac, uint8_t updateEntry,
 					     struct pe_session *pe_session);
 
-void lim_prepare_and_send_del_sta_cnf(tpAniSirGlobal mac, tpDphHashNode pStaDs,
+void lim_prepare_and_send_del_sta_cnf(struct mac_context *mac, tpDphHashNode pStaDs,
 				      tSirResultCodes statusCode, struct pe_session *);
-QDF_STATUS lim_extract_ap_capabilities(tpAniSirGlobal mac, uint8_t *pIE,
+QDF_STATUS lim_extract_ap_capabilities(struct mac_context *mac, uint8_t *pIE,
 					  uint16_t ieLen,
 					  tpSirProbeRespBeacon beaconStruct);
-void lim_init_pre_auth_timer_table(tpAniSirGlobal mac,
+void lim_init_pre_auth_timer_table(struct mac_context *mac,
 				   tpLimPreAuthTable pPreAuthTimerTable);
-tpLimPreAuthNode lim_acquire_free_pre_auth_node(tpAniSirGlobal mac,
+tpLimPreAuthNode lim_acquire_free_pre_auth_node(struct mac_context *mac,
 						tpLimPreAuthTable
 						pPreAuthTimerTable);
-tpLimPreAuthNode lim_get_pre_auth_node_from_index(tpAniSirGlobal mac,
+tpLimPreAuthNode lim_get_pre_auth_node_from_index(struct mac_context *mac,
 						  tpLimPreAuthTable pAuthTable,
 						  uint32_t authNodeIdx);
 
 /* Util API to check if the channels supported by STA is within range */
-QDF_STATUS lim_is_dot11h_supported_channels_valid(tpAniSirGlobal mac,
+QDF_STATUS lim_is_dot11h_supported_channels_valid(struct mac_context *mac,
 						     tSirAssocReq *assoc);
 
 /* Util API to check if the txpower supported by STA is within range */
-QDF_STATUS lim_is_dot11h_power_capabilities_in_range(tpAniSirGlobal mac,
+QDF_STATUS lim_is_dot11h_power_capabilities_in_range(struct mac_context *mac,
 							tSirAssocReq *assoc,
 							struct pe_session *);
 /* API to fill in RX Highest Supported data Rate */
-void lim_fill_rx_highest_supported_rate(tpAniSirGlobal mac,
+void lim_fill_rx_highest_supported_rate(struct mac_context *mac,
 					uint16_t *rxHighestRate,
 					uint8_t *pSupportedMCSSet);
 #ifdef WLAN_FEATURE_11W
-void lim_send_sme_unprotected_mgmt_frame_ind(tpAniSirGlobal mac, uint8_t frameType,
+void lim_send_sme_unprotected_mgmt_frame_ind(struct mac_context *mac, uint8_t frameType,
 					     uint8_t *frame, uint32_t frameLen,
 					     uint16_t sessionId,
 					     struct pe_session *pe_session);
 #endif
 
 #ifdef FEATURE_WLAN_ESE
-void lim_send_sme_tsm_ie_ind(tpAniSirGlobal mac, struct pe_session *pe_session,
+void lim_send_sme_tsm_ie_ind(struct mac_context *mac, struct pe_session *pe_session,
 			     uint8_t tid, uint8_t state, uint16_t measInterval);
 #else
-static inline void lim_send_sme_tsm_ie_ind(tpAniSirGlobal mac,
+static inline void lim_send_sme_tsm_ie_ind(struct mac_context *mac,
 	struct pe_session *pe_session, uint8_t tid,
 	uint8_t state, uint16_t measInterval)
 {}
 #endif /* FEATURE_WLAN_ESE */
 
-QDF_STATUS lim_populate_vht_mcs_set(tpAniSirGlobal mac,
+QDF_STATUS lim_populate_vht_mcs_set(struct mac_context *mac,
 				       tpSirSupportedRates pRates,
 				       tDot11fIEVHTCaps *pPeerVHTCaps,
 				       struct pe_session *pe_session,

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

@@ -39,7 +39,7 @@
 #include "wmm_apsd.h"
 #include "wma.h"
 
-extern void lim_send_set_sta_key_req(tpAniSirGlobal mac,
+extern void lim_send_set_sta_key_req(struct mac_context *mac,
 				     tLimMlmSetKeysReq * pMlmSetKeysReq,
 				     uint16_t staIdx,
 				     uint8_t defWEPIdx,
@@ -48,14 +48,14 @@ extern void lim_send_set_sta_key_req(tpAniSirGlobal mac,
 /*--------------------------------------------------------------------------
    Initialize the FT variables.
    ------------------------------------------------------------------------*/
-void lim_ft_open(tpAniSirGlobal mac, struct pe_session *pe_session)
+void lim_ft_open(struct mac_context *mac, struct pe_session *pe_session)
 {
 	if (pe_session)
 		qdf_mem_set(&pe_session->ftPEContext, sizeof(tftPEContext),
 			    0);
 }
 
-void lim_ft_cleanup_all_ft_sessions(tpAniSirGlobal mac)
+void lim_ft_cleanup_all_ft_sessions(struct mac_context *mac)
 {
 	/* Wrapper function to cleanup all FT sessions */
 	int i;
@@ -68,7 +68,7 @@ void lim_ft_cleanup_all_ft_sessions(tpAniSirGlobal mac)
 	}
 }
 
-void lim_ft_cleanup(tpAniSirGlobal mac, struct pe_session *pe_session)
+void lim_ft_cleanup(struct mac_context *mac, struct pe_session *pe_session)
 {
 	if (NULL == pe_session) {
 		pe_err("pe_session is NULL");
@@ -118,7 +118,7 @@ void lim_ft_cleanup(tpAniSirGlobal mac, struct pe_session *pe_session)
  * The newly created ft Session entry is passed to this function
  *
  *------------------------------------------------------------------*/
-void lim_ft_prepare_add_bss_req(tpAniSirGlobal mac,
+void lim_ft_prepare_add_bss_req(struct mac_context *mac,
 		uint8_t updateEntry, struct pe_session *ft_session,
 		tpSirBssDescription bssDescription)
 {
@@ -479,7 +479,7 @@ void lim_ft_prepare_add_bss_req(tpAniSirGlobal mac,
  *
  * Return: none
  */
-static void lim_fill_dot11mode(tpAniSirGlobal mac_ctx,
+static void lim_fill_dot11mode(struct mac_context *mac_ctx,
 			struct pe_session *ft_session, struct pe_session *pe_session)
 {
 	uint32_t self_dot11_mode;
@@ -505,7 +505,7 @@ static void lim_fill_dot11mode(tpAniSirGlobal mac_ctx,
  *
  * Return: none
  */
-static void lim_fill_dot11mode(tpAniSirGlobal mac_ctx,
+static void lim_fill_dot11mode(struct mac_context *mac_ctx,
 			struct pe_session *ft_session, struct pe_session *pe_session)
 {
 	ft_session->dot11mode =
@@ -520,7 +520,7 @@ static void lim_fill_dot11mode(tpAniSirGlobal mac_ctx,
  * Return the newly created session entry.
  *
  *------------------------------------------------------------------*/
-void lim_fill_ft_session(tpAniSirGlobal mac,
+void lim_fill_ft_session(struct mac_context *mac,
 			 tpSirBssDescription pbssDescription,
 			 struct pe_session *ft_session, struct pe_session *pe_session)
 {
@@ -736,7 +736,7 @@ void lim_fill_ft_session(tpAniSirGlobal mac,
  * This function is called to process the update key request from SME
  *
  *------------------------------------------------------------------*/
-bool lim_process_ft_update_key(tpAniSirGlobal mac, uint32_t *pMsgBuf)
+bool lim_process_ft_update_key(struct mac_context *mac, uint32_t *pMsgBuf)
 {
 	tAddBssParams *pAddBssParams;
 	tSirFTUpdateKeyInfo *pKeyInfo;
@@ -824,7 +824,7 @@ bool lim_process_ft_update_key(tpAniSirGlobal mac, uint32_t *pMsgBuf)
 }
 
 static void
-lim_ft_send_aggr_qos_rsp(tpAniSirGlobal mac, uint8_t rspReqd,
+lim_ft_send_aggr_qos_rsp(struct mac_context *mac, uint8_t rspReqd,
 			 tpAggrAddTsParams aggrQosRsp, uint8_t smesessionId)
 {
 	tpSirAggrQosRsp rsp;
@@ -856,7 +856,7 @@ lim_ft_send_aggr_qos_rsp(tpAniSirGlobal mac, uint8_t rspReqd,
 	return;
 }
 
-void lim_process_ft_aggr_qo_s_rsp(tpAniSirGlobal mac,
+void lim_process_ft_aggr_qo_s_rsp(struct mac_context *mac,
 				  struct scheduler_msg *limMsg)
 {
 	tpAggrAddTsParams pAggrQosRspMsg = NULL;
@@ -920,7 +920,7 @@ void lim_process_ft_aggr_qo_s_rsp(tpAniSirGlobal mac,
 	return;
 }
 
-QDF_STATUS lim_process_ft_aggr_qos_req(tpAniSirGlobal mac, uint32_t *pMsgBuf)
+QDF_STATUS lim_process_ft_aggr_qos_req(struct mac_context *mac, uint32_t *pMsgBuf)
 {
 	struct scheduler_msg msg = {0};
 	tSirAggrQosReq *aggrQosReq = (tSirAggrQosReq *) pMsgBuf;

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

@@ -44,7 +44,7 @@
  *
  * Return: None
  */
-void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal mac,
+void lim_ft_cleanup_pre_auth_info(struct mac_context *mac,
 		struct pe_session *pe_session)
 {
 	struct pe_session *pReAssocSessionEntry = NULL;
@@ -123,7 +123,7 @@ void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal mac,
  *
  * Return: value to indicate if buffer was consumed
  */
-int lim_process_ft_pre_auth_req(tpAniSirGlobal mac_ctx,
+int lim_process_ft_pre_auth_req(struct mac_context *mac_ctx,
 				struct scheduler_msg *msg)
 {
 	int buf_consumed = false;
@@ -221,7 +221,7 @@ int lim_process_ft_pre_auth_req(tpAniSirGlobal mac_ctx,
  *
  * Return: None
  */
-void lim_perform_ft_pre_auth(tpAniSirGlobal mac, QDF_STATUS status,
+void lim_perform_ft_pre_auth(struct mac_context *mac, QDF_STATUS status,
 			     uint32_t *data, struct pe_session *pe_session)
 {
 	tSirMacAuthFrameBody authFrame;
@@ -313,7 +313,7 @@ preauth_fail:
  *
  * Return: Success or Failure Status
  */
-QDF_STATUS lim_ft_setup_auth_session(tpAniSirGlobal mac,
+QDF_STATUS lim_ft_setup_auth_session(struct mac_context *mac,
 					struct pe_session *pe_session)
 {
 	struct pe_session *ft_session = NULL;
@@ -355,7 +355,7 @@ QDF_STATUS lim_ft_setup_auth_session(tpAniSirGlobal mac,
  *
  * Return: None
  */
-static void lim_ft_process_pre_auth_result(tpAniSirGlobal mac,
+static void lim_ft_process_pre_auth_result(struct mac_context *mac,
 					   struct pe_session *pe_session)
 {
 	if (NULL == pe_session ||
@@ -396,7 +396,7 @@ static void lim_ft_process_pre_auth_result(tpAniSirGlobal mac,
  *
  * @Return: None
  */
-void lim_handle_ft_pre_auth_rsp(tpAniSirGlobal mac, QDF_STATUS status,
+void lim_handle_ft_pre_auth_rsp(struct mac_context *mac, QDF_STATUS status,
 				uint8_t *auth_rsp, uint16_t auth_rsp_length,
 				struct pe_session *pe_session)
 {
@@ -512,7 +512,7 @@ send_rsp:
  *
  * Return: void
  */
-void lim_process_ft_preauth_rsp_timeout(tpAniSirGlobal mac_ctx)
+void lim_process_ft_preauth_rsp_timeout(struct mac_context *mac_ctx)
 {
 	struct pe_session *session;
 
@@ -587,7 +587,7 @@ void lim_process_ft_preauth_rsp_timeout(tpAniSirGlobal mac_ctx)
  *
  * Return: void
  */
-void lim_post_ft_pre_auth_rsp(tpAniSirGlobal mac_ctx,
+void lim_post_ft_pre_auth_rsp(struct mac_context *mac_ctx,
 			      QDF_STATUS status,
 			      uint8_t *auth_rsp,
 			      uint16_t auth_rsp_length,
@@ -666,7 +666,7 @@ void lim_post_ft_pre_auth_rsp(tpAniSirGlobal mac_ctx,
  *
  * Return: Status of sending message to scan module.
  */
-QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx,
+QDF_STATUS lim_send_preauth_scan_offload(struct mac_context *mac_ctx,
 					 struct pe_session *session_entry,
 					 tSirFTPreAuthReq *ft_preauth_req)
 {
@@ -749,7 +749,7 @@ QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx,
  * Return: void
  */
 
-void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx,
+void lim_preauth_scan_event_handler(struct mac_context *mac_ctx,
 				enum sir_scan_event_type event,
 				uint8_t session_id,
 				uint32_t scan_id)

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

@@ -53,7 +53,7 @@
  * @return Pointer to peer node if found, else NULL
  */
 
-static tLimIbssPeerNode *ibss_peer_find(tpAniSirGlobal mac,
+static tLimIbssPeerNode *ibss_peer_find(struct mac_context *mac,
 					tSirMacAddr macAddr)
 {
 	tLimIbssPeerNode *pTempNode = mac->lim.gLimIbssPeerList;
@@ -89,7 +89,7 @@ static tLimIbssPeerNode *ibss_peer_find(tpAniSirGlobal mac,
  */
 
 static QDF_STATUS
-ibss_peer_add(tpAniSirGlobal mac, tLimIbssPeerNode *pPeerNode)
+ibss_peer_add(struct mac_context *mac, tLimIbssPeerNode *pPeerNode)
 {
 #ifdef ANI_SIR_IBSS_PEER_CACHING
 	uint32_t numIbssPeers = (2 * mac->lim.maxStation);
@@ -145,7 +145,7 @@ ibss_peer_add(tpAniSirGlobal mac, tLimIbssPeerNode *pPeerNode)
  */
 
 static void
-ibss_peer_collect(tpAniSirGlobal mac,
+ibss_peer_collect(struct mac_context *mac,
 		  tpSchBeaconStruct pBeacon,
 		  tpSirMacMgmtHdr pHdr,
 		  tLimIbssPeerNode *peer, struct pe_session *pe_session)
@@ -215,7 +215,7 @@ ibss_peer_collect(tpAniSirGlobal mac,
 
 /* handle change in peer qos/wme capabilities */
 static void
-ibss_sta_caps_update(tpAniSirGlobal mac,
+ibss_sta_caps_update(struct mac_context *mac,
 		     tLimIbssPeerNode *pPeerNode, struct pe_session *pe_session)
 {
 	uint16_t peerIdx;
@@ -316,7 +316,7 @@ ibss_sta_caps_update(tpAniSirGlobal mac,
 }
 
 static void
-ibss_sta_rates_update(tpAniSirGlobal mac,
+ibss_sta_rates_update(struct mac_context *mac,
 		      tpDphHashNode pStaDs,
 		      tLimIbssPeerNode *peer, struct pe_session *pe_session)
 {
@@ -348,7 +348,7 @@ ibss_sta_rates_update(tpAniSirGlobal mac,
  */
 
 static void
-ibss_sta_info_update(tpAniSirGlobal mac,
+ibss_sta_info_update(struct mac_context *mac,
 		     tpDphHashNode pStaDs,
 		     tLimIbssPeerNode *peer, struct pe_session *pe_session)
 {
@@ -357,7 +357,7 @@ ibss_sta_info_update(tpAniSirGlobal mac,
 	ibss_sta_rates_update(mac, pStaDs, peer, pe_session);
 } /*** end ibss_sta_info_update() ***/
 
-static void ibss_coalesce_free(tpAniSirGlobal mac)
+static void ibss_coalesce_free(struct mac_context *mac)
 {
 	if (mac->lim.ibssInfo.pHdr != NULL)
 		qdf_mem_free(mac->lim.ibssInfo.pHdr);
@@ -372,7 +372,7 @@ static void ibss_coalesce_free(tpAniSirGlobal mac)
  * save the beacon params for use when adding the bss
  */
 static void
-ibss_coalesce_save(tpAniSirGlobal mac,
+ibss_coalesce_save(struct mac_context *mac,
 		   tpSirMacMgmtHdr pHdr, tpSchBeaconStruct pBeacon)
 {
 	/* get rid of any saved info */
@@ -397,7 +397,7 @@ ibss_coalesce_save(tpAniSirGlobal mac,
  * if necessary, an existing entry is eliminated
  */
 static QDF_STATUS
-ibss_dph_entry_add(tpAniSirGlobal mac,
+ibss_dph_entry_add(struct mac_context *mac,
 		   tSirMacAddr peerAddr,
 		   tpDphHashNode *ppSta, struct pe_session *pe_session)
 {
@@ -449,7 +449,7 @@ ibss_dph_entry_add(tpAniSirGlobal mac,
 
 /* send a status change notification */
 static void
-ibss_status_chg_notify(tpAniSirGlobal mac, tSirMacAddr peerAddr,
+ibss_status_chg_notify(struct mac_context *mac, tSirMacAddr peerAddr,
 		       uint16_t staIndex, uint16_t status, uint8_t sessionId)
 {
 
@@ -475,7 +475,7 @@ ibss_status_chg_notify(tpAniSirGlobal mac, tSirMacAddr peerAddr,
 	}
 }
 
-void ibss_bss_add(tpAniSirGlobal mac, struct pe_session *pe_session)
+void ibss_bss_add(struct mac_context *mac, struct pe_session *pe_session)
 {
 	tLimMlmStartReq mlmStartReq;
 	uint32_t cfg;
@@ -587,7 +587,7 @@ void ibss_bss_add(tpAniSirGlobal mac, struct pe_session *pe_session)
 
 }
 
-void ibss_bss_delete(tpAniSirGlobal mac_ctx, struct pe_session *session)
+void ibss_bss_delete(struct mac_context *mac_ctx, struct pe_session *session)
 {
 	QDF_STATUS status;
 
@@ -619,7 +619,7 @@ void ibss_bss_delete(tpAniSirGlobal mac_ctx, struct pe_session *session)
  * @return None
  */
 
-void lim_ibss_init(tpAniSirGlobal mac)
+void lim_ibss_init(struct mac_context *mac)
 {
 	mac->lim.gLimIbssCoalescingHappened = 0;
 	mac->lim.gLimIbssPeerList = NULL;
@@ -644,7 +644,7 @@ void lim_ibss_init(tpAniSirGlobal mac)
  * @param  mac - Pointer to Global MAC structure
  * @return None
  */
-void lim_ibss_delete_all_peers(tpAniSirGlobal mac,
+void lim_ibss_delete_all_peers(struct mac_context *mac,
 			       struct pe_session *pe_session)
 {
 	tLimIbssPeerNode *pCurrNode, *pTempNode;
@@ -729,7 +729,7 @@ void lim_ibss_delete_all_peers(tpAniSirGlobal mac,
  * Return: none
  */
 
-void lim_ibss_delete(tpAniSirGlobal mac, struct pe_session *pe_session)
+void lim_ibss_delete(struct mac_context *mac, struct pe_session *pe_session)
 {
 #ifndef CONFIG_VDEV_SM
 	lim_ibss_delete_all_peers(mac, pe_session);
@@ -741,13 +741,13 @@ void lim_ibss_delete(tpAniSirGlobal mac, struct pe_session *pe_session)
    \fn lim_ibss_set_protection
    \brief Decides all the protection related information.
  \
-   \param  tpAniSirGlobal    mac
+   \param  struct mac_context *   mac
    \param  tSirMacAddr peerMacAddr
    \param  tpUpdateBeaconParams pBeaconParams
    \return None
    -------------------------------------------------------------*/
 static void
-lim_ibss_set_protection(tpAniSirGlobal mac, uint8_t enable,
+lim_ibss_set_protection(struct mac_context *mac, uint8_t enable,
 			tpUpdateBeaconParams pBeaconParams,
 			struct pe_session *pe_session)
 {
@@ -784,13 +784,13 @@ lim_ibss_set_protection(tpAniSirGlobal mac, uint8_t enable,
    \fn lim_ibss_update_protection_params
    \brief Decides all the protection related information.
  \
-   \param  tpAniSirGlobal    mac
+   \param  struct mac_context *   mac
    \param  tSirMacAddr peerMacAddr
    \param  tpUpdateBeaconParams pBeaconParams
    \return None
    -------------------------------------------------------------*/
 static void
-lim_ibss_update_protection_params(tpAniSirGlobal mac,
+lim_ibss_update_protection_params(struct mac_context *mac,
 				  tSirMacAddr peerMacAddr,
 				  tLimProtStaCacheType protStaCacheType,
 				  struct pe_session *pe_session)
@@ -842,13 +842,13 @@ lim_ibss_update_protection_params(tpAniSirGlobal mac,
    \fn lim_ibss_decide_protection
    \brief Decides all the protection related information.
  \
-   \param  tpAniSirGlobal    mac
+   \param  struct mac_context *   mac
    \param  tSirMacAddr peerMacAddr
    \param  tpUpdateBeaconParams pBeaconParams
    \return None
    -------------------------------------------------------------*/
 static void
-lim_ibss_decide_protection(tpAniSirGlobal mac, tpDphHashNode pStaDs,
+lim_ibss_decide_protection(struct mac_context *mac, tpDphHashNode pStaDs,
 			   tpUpdateBeaconParams pBeaconParams,
 			   struct pe_session *pe_session)
 {
@@ -909,7 +909,7 @@ lim_ibss_decide_protection(tpAniSirGlobal mac, tpDphHashNode pStaDs,
  *
  * @return Pointer to peer node if found, else NULL
  */
-tLimIbssPeerNode *lim_ibss_peer_find(tpAniSirGlobal mac, tSirMacAddr macAddr)
+tLimIbssPeerNode *lim_ibss_peer_find(struct mac_context *mac, tSirMacAddr macAddr)
 {
 	return ibss_peer_find(mac, macAddr);
 }
@@ -937,7 +937,7 @@ tLimIbssPeerNode *lim_ibss_peer_find(tpAniSirGlobal mac, tSirMacAddr macAddr)
  */
 
 QDF_STATUS
-lim_ibss_sta_add(tpAniSirGlobal mac, void *pBody, struct pe_session *pe_session)
+lim_ibss_sta_add(struct mac_context *mac, void *pBody, struct pe_session *pe_session)
 {
 	QDF_STATUS retCode = QDF_STATUS_SUCCESS;
 	tpDphHashNode pStaDs;
@@ -1022,7 +1022,7 @@ lim_ibss_sta_add(tpAniSirGlobal mac, void *pBody, struct pe_session *pe_session)
  *
  */
 static void
-lim_ibss_search_and_delete_peer(tpAniSirGlobal mac_ctx,
+lim_ibss_search_and_delete_peer(struct mac_context *mac_ctx,
 			struct pe_session *session_entry, tSirMacAddr mac_addr)
 {
 	tLimIbssPeerNode *temp_node, *prev_node;
@@ -1084,7 +1084,7 @@ lim_ibss_search_and_delete_peer(tpAniSirGlobal mac_ctx,
  *
  */
 static void
-lim_ibss_delete_peer(tpAniSirGlobal mac_ctx,
+lim_ibss_delete_peer(struct mac_context *mac_ctx,
 			struct pe_session *session_entry, tSirMacAddr mac_addr)
 {
 	tpDphHashNode sta = NULL;
@@ -1123,7 +1123,7 @@ lim_ibss_delete_peer(tpAniSirGlobal mac_ctx,
 
 }
 
-void lim_process_ibss_del_sta_rsp(tpAniSirGlobal mac_ctx,
+void lim_process_ibss_del_sta_rsp(struct mac_context *mac_ctx,
 	struct scheduler_msg *lim_msg,
 	struct pe_session *pe_session)
 {
@@ -1180,7 +1180,7 @@ skip_event:
 
 /* handle the response from HAL for an ADD STA request */
 QDF_STATUS
-lim_ibss_add_sta_rsp(tpAniSirGlobal mac, void *msg, struct pe_session *pe_session)
+lim_ibss_add_sta_rsp(struct mac_context *mac, void *msg, struct pe_session *pe_session)
 {
 	tpDphHashNode pStaDs;
 	uint16_t peerIdx;
@@ -1229,7 +1229,7 @@ lim_ibss_add_sta_rsp(tpAniSirGlobal mac, void *msg, struct pe_session *pe_sessio
 	return QDF_STATUS_SUCCESS;
 }
 
-void lim_ibss_del_bss_rsp_when_coalescing(tpAniSirGlobal mac, void *msg,
+void lim_ibss_del_bss_rsp_when_coalescing(struct mac_context *mac, void *msg,
 					  struct pe_session *pe_session)
 {
 	tpDeleteBssParams pDelBss = (tpDeleteBssParams) msg;
@@ -1258,7 +1258,7 @@ end:
 		qdf_mem_free(pDelBss);
 }
 
-void lim_ibss_add_bss_rsp_when_coalescing(tpAniSirGlobal mac, void *msg,
+void lim_ibss_add_bss_rsp_when_coalescing(struct mac_context *mac, void *msg,
 					  struct pe_session *pe_session)
 {
 	uint8_t infoLen;
@@ -1298,7 +1298,7 @@ end:
 	ibss_coalesce_free(mac);
 }
 
-void lim_ibss_del_bss_rsp(tpAniSirGlobal mac, void *msg, struct pe_session *pe_session)
+void lim_ibss_del_bss_rsp(struct mac_context *mac, void *msg, struct pe_session *pe_session)
 {
 	tSirResultCodes rc = eSIR_SME_SUCCESS;
 	tpDeleteBssParams pDelBss = (tpDeleteBssParams) msg;
@@ -1397,7 +1397,7 @@ end:
  */
 
 QDF_STATUS
-lim_ibss_coalesce(tpAniSirGlobal mac,
+lim_ibss_coalesce(struct mac_context *mac,
 		  tpSirMacMgmtHdr pHdr,
 		  tpSchBeaconStruct pBeacon,
 		  uint8_t *pIEs,
@@ -1572,7 +1572,7 @@ lim_ibss_coalesce(tpAniSirGlobal mac,
  *
  * Return: None.
  */
-void lim_ibss_heart_beat_handle(tpAniSirGlobal mac_ctx, struct pe_session *session)
+void lim_ibss_heart_beat_handle(struct mac_context *mac_ctx, struct pe_session *session)
 {
 	tLimIbssPeerNode *tempnode, *prevnode;
 	tLimIbssPeerNode *temp_next = NULL;
@@ -1699,7 +1699,7 @@ void lim_ibss_heart_beat_handle(tpAniSirGlobal mac_ctx, struct pe_session *sessi
  *
  * Return: None
  */
-void lim_ibss_decide_protection_on_delete(tpAniSirGlobal mac_ctx,
+void lim_ibss_decide_protection_on_delete(struct mac_context *mac_ctx,
 					  tpDphHashNode stads,
 					  tpUpdateBeaconParams bcn_param,
 					  struct pe_session *session)
@@ -1748,13 +1748,13 @@ void lim_ibss_decide_protection_on_delete(tpAniSirGlobal mac_ctx,
    \fn __lim_ibss_peer_inactivity_handler
    \brief Internal function. Deletes FW indicated peer which is inactive
  \
-   \param  tpAniSirGlobal    mac
+   \param  struct mac_context *   mac
    \param  struct pe_session *      pe_session
    \param  tpSirIbssPeerInactivityInd peerInactivityInd
    \return None
    -----------------------------------------------------------------*/
 static void
-__lim_ibss_peer_inactivity_handler(tpAniSirGlobal mac,
+__lim_ibss_peer_inactivity_handler(struct mac_context *mac,
 				   struct pe_session *pe_session,
 				   tpSirIbssPeerInactivityInd peerInactivityInd)
 {
@@ -1771,11 +1771,11 @@ __lim_ibss_peer_inactivity_handler(tpAniSirGlobal mac,
    \fn lim_process_ibss_peer_inactivity
    \brief Peer inactivity message handler
  \
-   \param  tpAniSirGlobal    mac
+   \param  struct mac_context *   mac
    \param  void*             buf
    \return None
    -------------------------------------------------------------*/
-void lim_process_ibss_peer_inactivity(tpAniSirGlobal mac, void *buf)
+void lim_process_ibss_peer_inactivity(struct mac_context *mac, void *buf)
 {
 	/*
 	 * --------------- HEARTBEAT OFFLOAD CASE ------------------

core/mac/src/pe/lim/lim_ibss_peer_mgmt.h

@@ -37,7 +37,7 @@
  *
  * Return: None
  */
-void ibss_bss_add(tpAniSirGlobal mac_ctx, struct pe_session *session);
+void ibss_bss_add(struct mac_context *mac_ctx, struct pe_session *session);
 
 /**
  * ibss_bss_delete()- delete the current BSS
@@ -46,7 +46,7 @@ void ibss_bss_add(tpAniSirGlobal mac_ctx, struct pe_session *session);
  *
  * Return: None
  */
-void ibss_bss_delete(tpAniSirGlobal mac_ctx, struct pe_session *session);
+void ibss_bss_delete(struct mac_context *mac_ctx, struct pe_session *session);
 
 /**
  * lim_ibss_delete_all_peers: delete all IBSS peers.
@@ -55,15 +55,15 @@ void ibss_bss_delete(tpAniSirGlobal mac_ctx, struct pe_session *session);
  *
  * Return: None
  */
-void lim_ibss_delete_all_peers(tpAniSirGlobal mac_ctx, struct pe_session *session);
+void lim_ibss_delete_all_peers(struct mac_context *mac_ctx, struct pe_session *session);
 
-void lim_ibss_init(tpAniSirGlobal);
-void lim_ibss_delete(tpAniSirGlobal, struct pe_session *pe_session);
-QDF_STATUS lim_ibss_coalesce(tpAniSirGlobal, tpSirMacMgmtHdr,
+void lim_ibss_init(struct mac_context *);
+void lim_ibss_delete(struct mac_context *, struct pe_session *pe_session);
+QDF_STATUS lim_ibss_coalesce(struct mac_context *, tpSirMacMgmtHdr,
 				tpSchBeaconStruct, uint8_t *, uint32_t, uint16_t,
 				struct pe_session *);
-QDF_STATUS lim_ibss_sta_add(tpAniSirGlobal, void *, struct pe_session *);
-QDF_STATUS lim_ibss_add_sta_rsp(tpAniSirGlobal, void *, struct pe_session *);
+QDF_STATUS lim_ibss_sta_add(struct mac_context *, void *, struct pe_session *);
+QDF_STATUS lim_ibss_add_sta_rsp(struct mac_context *, void *, struct pe_session *);
 
 /**
  * lim_process_ibss_del_sta_rsp()- Handle ibss delete
@@ -76,16 +76,16 @@ QDF_STATUS lim_ibss_add_sta_rsp(tpAniSirGlobal, void *, struct pe_session *);
  * Return: None
  *
  */
-void lim_process_ibss_del_sta_rsp(tpAniSirGlobal mac_ctx,
+void lim_process_ibss_del_sta_rsp(struct mac_context *mac_ctx,
 	struct scheduler_msg *lim_msg,
 	struct pe_session *pe_session);
-tLimIbssPeerNode *lim_ibss_peer_find(tpAniSirGlobal mac, tSirMacAddr macAddr);
-void lim_ibss_del_bss_rsp(tpAniSirGlobal, void *, struct pe_session *);
-void lim_ibss_del_bss_rsp_when_coalescing(tpAniSirGlobal, void *, struct pe_session *);
-void lim_ibss_add_bss_rsp_when_coalescing(tpAniSirGlobal mac, void *msg,
+tLimIbssPeerNode *lim_ibss_peer_find(struct mac_context *mac, tSirMacAddr macAddr);
+void lim_ibss_del_bss_rsp(struct mac_context *, void *, struct pe_session *);
+void lim_ibss_del_bss_rsp_when_coalescing(struct mac_context *, void *, struct pe_session *);
+void lim_ibss_add_bss_rsp_when_coalescing(struct mac_context *mac, void *msg,
 					  struct pe_session *pe_session);
-void lim_ibss_decide_protection_on_delete(tpAniSirGlobal mac, tpDphHashNode pStaDs,
+void lim_ibss_decide_protection_on_delete(struct mac_context *mac, tpDphHashNode pStaDs,
 					  tpUpdateBeaconParams pBeaconParams,
 					  struct pe_session *pe_session);
-void lim_ibss_heart_beat_handle(tpAniSirGlobal mac, struct pe_session *pe_session);
-void lim_process_ibss_peer_inactivity(tpAniSirGlobal mac, void *buf);
+void lim_ibss_heart_beat_handle(struct mac_context *mac, struct pe_session *pe_session);
+void lim_process_ibss_peer_inactivity(struct mac_context *mac, void *buf);

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

@@ -57,7 +57,7 @@
  *
  * Return: None.
  */
-static void lim_delete_sta_util(tpAniSirGlobal mac_ctx, tpDeleteStaContext msg,
+static void lim_delete_sta_util(struct mac_context *mac_ctx, tpDeleteStaContext msg,
 				struct pe_session *session_entry)
 {
 	tpDphHashNode stads;
@@ -193,7 +193,7 @@ static void lim_delete_sta_util(tpAniSirGlobal mac_ctx, tpDeleteStaContext msg,
  *
  * Return: none
  */
-void lim_delete_sta_context(tpAniSirGlobal mac_ctx,
+void lim_delete_sta_context(struct mac_context *mac_ctx,
 			    struct scheduler_msg *lim_msg)
 {
 	tpDeleteStaContext msg = (tpDeleteStaContext) lim_msg->bodyptr;
@@ -292,7 +292,7 @@ void lim_delete_sta_context(tpAniSirGlobal mac_ctx,
  * @return None
  */
 void
-lim_trigger_sta_deletion(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
+lim_trigger_sta_deletion(struct mac_context *mac_ctx, tpDphHashNode sta_ds,
 			 struct pe_session *session_entry)
 {
 	tLimMlmDisassocInd mlm_disassoc_ind;
@@ -354,7 +354,7 @@ lim_trigger_sta_deletion(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
  */
 
 void
-lim_tear_down_link_with_ap(tpAniSirGlobal mac, uint8_t sessionId,
+lim_tear_down_link_with_ap(struct mac_context *mac, uint8_t sessionId,
 			   tSirMacReasonCodes reasonCode)
 {
 	tpDphHashNode pStaDs = NULL;
@@ -451,7 +451,7 @@ lim_tear_down_link_with_ap(tpAniSirGlobal mac, uint8_t sessionId,
  * Return: None
  */
 
-void lim_handle_heart_beat_failure(tpAniSirGlobal mac_ctx,
+void lim_handle_heart_beat_failure(struct mac_context *mac_ctx,
 				   struct pe_session *session)
 {
 	uint8_t curr_chan;
@@ -562,7 +562,7 @@ hb_handler_fail:
 					 WLAN_CONTROL_PATH);
 }
 
-void lim_rx_invalid_peer_process(tpAniSirGlobal mac_ctx,
+void lim_rx_invalid_peer_process(struct mac_context *mac_ctx,
 				 struct scheduler_msg *lim_msg)
 {
 	struct ol_rx_inv_peer_params *msg =

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

@@ -69,7 +69,7 @@ static last_processed_msg rrm_link_action_frm;
    \param  mac
    \return NONE
    -----------------------------------------------------------------*/
-void lim_stop_tx_and_switch_channel(tpAniSirGlobal mac, uint8_t sessionId)
+void lim_stop_tx_and_switch_channel(struct mac_context *mac, uint8_t sessionId)
 {
 	struct pe_session *pe_session;
 
@@ -117,7 +117,7 @@ void lim_stop_tx_and_switch_channel(tpAniSirGlobal mac, uint8_t sessionId)
    \param  pe_session
    \return NONE
    ------------------------------------------------------------*/
-QDF_STATUS lim_start_channel_switch(tpAniSirGlobal mac,
+QDF_STATUS lim_start_channel_switch(struct mac_context *mac,
 				       struct pe_session *pe_session)
 {
 	pe_debug("Starting the channel switch");
@@ -169,7 +169,7 @@ QDF_STATUS lim_start_channel_switch(tpAniSirGlobal mac,
  * Return: None
  */
 
-static void __lim_process_channel_switch_action_frame(tpAniSirGlobal mac_ctx,
+static void __lim_process_channel_switch_action_frame(struct mac_context *mac_ctx,
 			  uint8_t *rx_pkt_info, struct pe_session *session)
 {
 	tpSirMacMgmtHdr mac_hdr;
@@ -304,7 +304,7 @@ static void __lim_process_channel_switch_action_frame(tpAniSirGlobal mac_ctx,
  * Return: void
  */
 static void
-lim_process_ext_channel_switch_action_frame(tpAniSirGlobal mac_ctx,
+lim_process_ext_channel_switch_action_frame(struct mac_context *mac_ctx,
 		uint8_t *rx_packet_info, struct pe_session *session_entry)
 {
 
@@ -397,7 +397,7 @@ lim_process_ext_channel_switch_action_frame(tpAniSirGlobal mac_ctx,
  *
  * Return: None
  */
-static void __lim_process_operating_mode_action_frame(tpAniSirGlobal mac_ctx,
+static void __lim_process_operating_mode_action_frame(struct mac_context *mac_ctx,
 			uint8_t *rx_pkt_info, struct pe_session *session)
 {
 
@@ -540,7 +540,7 @@ end:
  *
  * Return: none
  */
-static void __lim_process_gid_management_action_frame(tpAniSirGlobal mac_ctx,
+static void __lim_process_gid_management_action_frame(struct mac_context *mac_ctx,
 			uint8_t *rx_pkt_info, struct pe_session *session)
 {
 
@@ -627,7 +627,7 @@ out:
 }
 
 static void
-__lim_process_add_ts_req(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
+__lim_process_add_ts_req(struct mac_context *mac, uint8_t *pRxPacketInfo,
 			 struct pe_session *pe_session)
 {
 }
@@ -642,7 +642,7 @@ __lim_process_add_ts_req(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
  *
  * Return: none
  */
-static void __lim_process_add_ts_rsp(tpAniSirGlobal mac_ctx,
+static void __lim_process_add_ts_rsp(struct mac_context *mac_ctx,
 		uint8_t *rx_pkt_info, struct pe_session *session)
 {
 	tSirAddtsRspInfo addts;
@@ -883,7 +883,7 @@ static void __lim_process_add_ts_rsp(tpAniSirGlobal mac_ctx,
  *
  * Return: none
  */
-static void __lim_process_del_ts_req(tpAniSirGlobal mac_ctx,
+static void __lim_process_del_ts_req(struct mac_context *mac_ctx,
 		uint8_t *rx_pkt_info, struct pe_session *session)
 {
 	QDF_STATUS retval;
@@ -1028,7 +1028,7 @@ static void __lim_process_del_ts_req(tpAniSirGlobal mac_ctx,
  *
  * Return: none
  */
-static void __lim_process_qos_map_configure_frame(tpAniSirGlobal mac_ctx,
+static void __lim_process_qos_map_configure_frame(struct mac_context *mac_ctx,
 			uint8_t *rx_pkt_info, struct pe_session *session)
 {
 	tpSirMacMgmtHdr mac_hdr;
@@ -1054,7 +1054,7 @@ static void __lim_process_qos_map_configure_frame(tpAniSirGlobal mac_ctx,
 
 #ifdef ANI_SUPPORT_11H
 static void
-__lim_process_basic_meas_req(tpAniSirGlobal mac,
+__lim_process_basic_meas_req(struct mac_context *mac,
 			     tpSirMacMeasReqActionFrame pMeasReqFrame,
 			     tSirMacAddr peerMacAddr, struct pe_session *pe_session)
 {
@@ -1066,7 +1066,7 @@ __lim_process_basic_meas_req(tpAniSirGlobal mac,
 	}
 }
 static void
-__lim_process_cca_meas_req(tpAniSirGlobal mac,
+__lim_process_cca_meas_req(struct mac_context *mac,
 			   tpSirMacMeasReqActionFrame pMeasReqFrame,
 			   tSirMacAddr peerMacAddr, struct pe_session *pe_session)
 {
@@ -1078,7 +1078,7 @@ __lim_process_cca_meas_req(tpAniSirGlobal mac,
 	}
 }
 static void
-__lim_process_rpi_meas_req(tpAniSirGlobal mac,
+__lim_process_rpi_meas_req(struct mac_context *mac,
 			   tpSirMacMeasReqActionFrame pMeasReqFrame,
 			   tSirMacAddr peerMacAddr, struct pe_session *pe_session)
 {
@@ -1090,7 +1090,7 @@ __lim_process_rpi_meas_req(tpAniSirGlobal mac,
 	}
 }
 static void
-__lim_process_measurement_request_frame(tpAniSirGlobal mac,
+__lim_process_measurement_request_frame(struct mac_context *mac,
 					uint8_t *pRxPacketInfo,
 					struct pe_session *pe_session)
 {
@@ -1132,7 +1132,7 @@ __lim_process_measurement_request_frame(tpAniSirGlobal mac,
 	}
 } /*** end limProcessMeasurementRequestFrame ***/
 static void
-__lim_process_tpc_request_frame(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
+__lim_process_tpc_request_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 				struct pe_session *pe_session)
 {
 	tpSirMacMgmtHdr pHdr;
@@ -1164,7 +1164,7 @@ __lim_process_tpc_request_frame(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
 #endif
 
 static void
-__lim_process_sm_power_save_update(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
+__lim_process_sm_power_save_update(struct mac_context *mac, uint8_t *pRxPacketInfo,
 				   struct pe_session *pe_session)
 {
 
@@ -1236,7 +1236,7 @@ __lim_process_sm_power_save_update(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
 
 
 static void
-__lim_process_radio_measure_request(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
+__lim_process_radio_measure_request(struct mac_context *mac, uint8_t *pRxPacketInfo,
 				    struct pe_session *pe_session)
 {
 	tpSirMacMgmtHdr pHdr;
@@ -1296,7 +1296,7 @@ err:
 }
 
 static QDF_STATUS
-__lim_process_link_measurement_req(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
+__lim_process_link_measurement_req(struct mac_context *mac, uint8_t *pRxPacketInfo,
 				   struct pe_session *pe_session)
 {
 	tpSirMacMgmtHdr pHdr;
@@ -1335,7 +1335,7 @@ __lim_process_link_measurement_req(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
 }
 
 static void
-__lim_process_neighbor_report(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
+__lim_process_neighbor_report(struct mac_context *mac, uint8_t *pRxPacketInfo,
 			      struct pe_session *pe_session)
 {
 	tpSirMacMgmtHdr pHdr;
@@ -1399,7 +1399,7 @@ __lim_process_neighbor_report(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
  *
  * @return None
  */
-static void __lim_process_sa_query_request_action_frame(tpAniSirGlobal mac,
+static void __lim_process_sa_query_request_action_frame(struct mac_context *mac,
 							uint8_t *pRxPacketInfo,
 							struct pe_session *pe_session)
 {
@@ -1466,7 +1466,7 @@ static void __lim_process_sa_query_request_action_frame(tpAniSirGlobal mac,
  * @param  pe_session - PE session entry
  * @return None
  */
-static void __lim_process_sa_query_response_action_frame(tpAniSirGlobal mac,
+static void __lim_process_sa_query_response_action_frame(struct mac_context *mac,
 							 uint8_t *pRxPacketInfo,
 							 struct pe_session *pe_session)
 {
@@ -1564,7 +1564,7 @@ static void __lim_process_sa_query_response_action_frame(tpAniSirGlobal mac,
  */
 
 static bool
-lim_drop_unprotected_action_frame(tpAniSirGlobal mac, struct pe_session *pe_session,
+lim_drop_unprotected_action_frame(struct mac_context *mac, struct pe_session *pe_session,
 				  tpSirMacMgmtHdr pHdr, uint8_t category)
 {
 	uint16_t aid;
@@ -1600,7 +1600,7 @@ lim_drop_unprotected_action_frame(tpAniSirGlobal mac, struct pe_session *pe_sess
  *
  * Return: None
  */
-static void lim_process_addba_req(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
+static void lim_process_addba_req(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 				  struct pe_session *session)
 {
 	tpSirMacMgmtHdr mac_hdr;
@@ -1682,7 +1682,7 @@ error:
  *
  * Return: None
  */
-static void lim_process_delba_req(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
+static void lim_process_delba_req(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 				  struct pe_session *session)
 {
 	tpSirMacMgmtHdr mac_hdr;
@@ -1755,7 +1755,7 @@ error:
  * Return: none
  */
 
-void lim_process_action_frame(tpAniSirGlobal mac_ctx,
+void lim_process_action_frame(struct mac_context *mac_ctx,
 		uint8_t *rx_pkt_info, struct pe_session *session)
 {
 	uint8_t *body_ptr = WMA_GET_RX_MPDU_DATA(rx_pkt_info);
@@ -2197,7 +2197,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
  * @param  *pBd - A pointer to Buffer descriptor + associated PDUs
  * @return None
  */
-void lim_process_action_frame_no_session(tpAniSirGlobal mac, uint8_t *pBd)
+void lim_process_action_frame_no_session(struct mac_context *mac, uint8_t *pBd)
 {
 	tpSirMacMgmtHdr mac_hdr = WMA_GET_RX_MAC_HEADER(pBd);
 	uint32_t frame_len = WMA_GET_RX_PAYLOAD_LEN(pBd);

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

@@ -57,7 +57,7 @@
  *
  * Return: None
  */
-static void lim_convert_supported_channels(tpAniSirGlobal mac_ctx,
+static void lim_convert_supported_channels(struct mac_context *mac_ctx,
 					   tpLimMlmAssocInd assoc_ind,
 					   tSirAssocReq *assoc_req)
 {
@@ -134,7 +134,7 @@ static void lim_convert_supported_channels(tpAniSirGlobal mac_ctx,
  *
  * Return: True if duplicate entry found; FALSE otherwise.
  */
-static bool lim_check_sta_in_pe_entries(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
+static bool lim_check_sta_in_pe_entries(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 				 uint16_t sessionid)
 {
 	uint8_t i;
@@ -192,7 +192,7 @@ static bool lim_check_sta_in_pe_entries(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr
  *
  * Return: true if source and destination address are different
  */
-static bool lim_chk_sa_da(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
+static bool lim_chk_sa_da(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 			  struct pe_session *session, uint8_t sub_type)
 {
 	if (qdf_mem_cmp((uint8_t *) hdr->sa,
@@ -217,7 +217,7 @@ static bool lim_chk_sa_da(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
  *
  * Return: true of no error, false otherwise
  */
-static bool lim_chk_tkip(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
+static bool lim_chk_tkip(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 			 struct pe_session *session, uint8_t sub_type)
 {
 	/*
@@ -247,7 +247,7 @@ static bool lim_chk_tkip(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
  *
  * Return: true of no error, false otherwise
  */
-static bool lim_chk_assoc_req_parse_error(tpAniSirGlobal mac_ctx,
+static bool lim_chk_assoc_req_parse_error(struct mac_context *mac_ctx,
 					  tpSirMacMgmtHdr hdr,
 					  struct pe_session *session,
 					  tpSirAssocReq assoc_req,
@@ -286,7 +286,7 @@ static bool lim_chk_assoc_req_parse_error(tpAniSirGlobal mac_ctx,
  *
  * Return: true of no error, false otherwise
  */
-static bool lim_chk_capab(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
+static bool lim_chk_capab(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 			  struct pe_session *session, tpSirAssocReq assoc_req,
 			  uint8_t sub_type, tSirMacCapabilityInfo *local_cap)
 {
@@ -330,7 +330,7 @@ static bool lim_chk_capab(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
  *
  * Return: true of no error, false otherwise
  */
-static bool lim_chk_ssid(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
+static bool lim_chk_ssid(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 			 struct pe_session *session, tpSirAssocReq assoc_req,
 			 uint8_t sub_type)
 {
@@ -366,7 +366,7 @@ static bool lim_chk_ssid(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
  *
  * Return: true of no error, false otherwise
  */
-static bool lim_chk_rates(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
+static bool lim_chk_rates(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 			  struct pe_session *session, tpSirAssocReq assoc_req,
 			  uint8_t sub_type)
 {
@@ -420,7 +420,7 @@ static bool lim_chk_rates(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
  *
  * Return: true of no error, false otherwise
  */
-static bool lim_chk_11g_only(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
+static bool lim_chk_11g_only(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 			     struct pe_session *session, tpSirAssocReq assoc_req,
 			     uint8_t sub_type)
 {
@@ -450,7 +450,7 @@ static bool lim_chk_11g_only(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
  *
  * Return: true of no error, false otherwise
  */
-static bool lim_chk_11n_only(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
+static bool lim_chk_11n_only(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 			     struct pe_session *session, tpSirAssocReq assoc_req,
 			     uint8_t sub_type)
 {
@@ -480,7 +480,7 @@ static bool lim_chk_11n_only(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
  *
  * Return: true of no error, false otherwise
  */
-static bool lim_chk_11ac_only(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
+static bool lim_chk_11ac_only(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 			      struct pe_session *session, tpSirAssocReq assoc_req,
 			      uint8_t sub_type)
 {
@@ -519,7 +519,7 @@ static bool lim_chk_11ac_only(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
  * Return: true of no error, false otherwise
  */
 #ifdef WLAN_FEATURE_11AX
-static bool lim_chk_11ax_only(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
+static bool lim_chk_11ax_only(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 			      struct pe_session *session, tpSirAssocReq assoc_req,
 			      uint8_t sub_type)
 {
@@ -547,7 +547,7 @@ static bool lim_chk_11ax_only(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
  *
  * Return: true of no error, false otherwise
  */
-static bool lim_check_11ax_basic_mcs(tpAniSirGlobal mac_ctx,
+static bool lim_check_11ax_basic_mcs(struct mac_context *mac_ctx,
 				     tpSirMacMgmtHdr hdr,
 				     struct pe_session *session,
 				     tpSirAssocReq assoc_req,
@@ -575,14 +575,14 @@ static bool lim_check_11ax_basic_mcs(tpAniSirGlobal mac_ctx,
 }
 
 #else
-static bool lim_chk_11ax_only(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
+static bool lim_chk_11ax_only(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 			      struct pe_session *session, tpSirAssocReq assoc_req,
 			      uint8_t sub_type)
 {
 	return true;
 }
 
-static bool lim_check_11ax_basic_mcs(tpAniSirGlobal mac_ctx,
+static bool lim_check_11ax_basic_mcs(struct mac_context *mac_ctx,
 				     tpSirMacMgmtHdr hdr,
 				     struct pe_session *session,
 				     tpSirAssocReq assoc_req,
@@ -606,7 +606,7 @@ static bool lim_check_11ax_basic_mcs(tpAniSirGlobal mac_ctx,
  * process assoc req for spectrum mgmt
  */
 static void
-lim_process_for_spectrum_mgmt(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
+lim_process_for_spectrum_mgmt(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 			      struct pe_session *session, tpSirAssocReq assoc_req,
 			      uint8_t sub_type, tSirMacCapabilityInfo local_cap)
 {
@@ -692,7 +692,7 @@ lim_process_for_spectrum_mgmt(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
  *
  * Return: true of no error, false otherwise
  */
-static bool lim_chk_mcs(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
+static bool lim_chk_mcs(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 			struct pe_session *session, tpSirAssocReq assoc_req,
 			uint8_t sub_type)
 {
@@ -728,7 +728,7 @@ static bool lim_chk_mcs(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
  *
  * Return: true of no error, false otherwise
  */
-static bool lim_chk_is_11b_sta_supported(tpAniSirGlobal mac_ctx,
+static bool lim_chk_is_11b_sta_supported(struct mac_context *mac_ctx,
 					 tpSirMacMgmtHdr hdr,
 					 struct pe_session *session,
 					 tpSirAssocReq assoc_req,
@@ -770,7 +770,7 @@ static bool lim_chk_is_11b_sta_supported(tpAniSirGlobal mac_ctx,
  *
  * Return: void
  */
-static void lim_print_ht_cap(tpAniSirGlobal mac_ctx, struct pe_session *session,
+static void lim_print_ht_cap(struct mac_context *mac_ctx, struct pe_session *session,
 			     tpSirAssocReq assoc_req)
 {
 	if (!session->htCapability)
@@ -902,7 +902,7 @@ static tSirMacStatusCodes lim_check_wpa_ie(struct pe_session *session,
   *
   * Return: true if no error, false otherwise
   */
-static bool lim_check_wpa_rsn_ie(struct pe_session *session, tpAniSirGlobal mac_ctx,
+static bool lim_check_wpa_rsn_ie(struct pe_session *session, struct mac_context *mac_ctx,
 				 uint8_t sub_type, tpSirMacMgmtHdr hdr,
 				 tpSirAssocReq assoc_req, bool *pmf_connection)
 {
@@ -1035,7 +1035,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session, tpAniSirGlobal mac_
  *
  * Return: true if no error, false otherwise
  */
-static bool lim_chk_n_process_wpa_rsn_ie(tpAniSirGlobal mac_ctx,
+static bool lim_chk_n_process_wpa_rsn_ie(struct mac_context *mac_ctx,
 					 tpSirMacMgmtHdr hdr,
 					 struct pe_session *session,
 					 tpSirAssocReq assoc_req,
@@ -1080,7 +1080,7 @@ static bool lim_chk_n_process_wpa_rsn_ie(tpAniSirGlobal mac_ctx,
  *
  * Return: true of no error, false otherwise
  */
-static bool lim_process_assoc_req_no_sta_ctx(tpAniSirGlobal mac_ctx,
+static bool lim_process_assoc_req_no_sta_ctx(struct mac_context *mac_ctx,
 				tpSirMacMgmtHdr hdr, struct pe_session *session,
 				tpSirAssocReq assoc_req, uint8_t sub_type,
 				struct tLimPreAuthNode *sta_pre_auth_ctx,
@@ -1145,7 +1145,7 @@ static bool lim_process_assoc_req_no_sta_ctx(tpAniSirGlobal mac_ctx,
  *
  * Return: true of no error, false otherwise
  */
-static bool lim_process_assoc_req_sta_ctx(tpAniSirGlobal mac_ctx,
+static bool lim_process_assoc_req_sta_ctx(struct mac_context *mac_ctx,
 				tpSirMacMgmtHdr hdr, struct pe_session *session,
 				tpSirAssocReq assoc_req, uint8_t sub_type,
 				struct tLimPreAuthNode *sta_pre_auth_ctx,
@@ -1285,7 +1285,7 @@ static bool lim_process_assoc_req_sta_ctx(tpAniSirGlobal mac_ctx,
  *
  * Return: true of no error, false otherwise
  */
-static bool lim_chk_wmm(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
+static bool lim_chk_wmm(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 			struct pe_session *session, tpSirAssocReq assoc_req,
 			uint8_t sub_type, tHalBitVal qos_mode)
 {
@@ -1349,7 +1349,7 @@ static bool lim_chk_wmm(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
  *
  * Return: true of no error, false otherwise
  */
-static bool lim_update_sta_ds(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
+static bool lim_update_sta_ds(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 			      struct pe_session *session, tpSirAssocReq assoc_req,
 			      uint8_t sub_type, tpDphHashNode sta_ds,
 			      tAniAuthType auth_type,
@@ -1714,7 +1714,7 @@ static bool lim_update_sta_ds(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
  *
  * Return: true of no error, false otherwise
  */
-static bool lim_update_sta_ctx(tpAniSirGlobal mac_ctx, struct pe_session *session,
+static bool lim_update_sta_ctx(struct mac_context *mac_ctx, struct pe_session *session,
 			       tpSirAssocReq assoc_req, uint8_t sub_type,
 			       tpDphHashNode sta_ds, uint8_t update_ctx)
 {
@@ -1825,7 +1825,7 @@ static bool lim_update_sta_ctx(tpAniSirGlobal mac_ctx, struct pe_session *sessio
  *
  * Return: void
  */
-static void lim_process_assoc_cleanup(tpAniSirGlobal mac_ctx,
+static void lim_process_assoc_cleanup(struct mac_context *mac_ctx,
 				      struct pe_session *session,
 				      tpSirAssocReq assoc_req,
 				      tpDphHashNode sta_ds,
@@ -1878,7 +1878,7 @@ static void lim_process_assoc_cleanup(tpAniSirGlobal mac_ctx,
  *
  * @Return: void
  */
-void lim_process_assoc_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
+void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 				 uint8_t sub_type, struct pe_session *session)
 {
 	bool pmf_connection = false, assoc_req_copied = false;
@@ -2219,7 +2219,7 @@ error:
  *
  * Return: None
  */
-static void lim_fill_assoc_ind_wapi_info(tpAniSirGlobal mac_ctx,
+static void lim_fill_assoc_ind_wapi_info(struct mac_context *mac_ctx,
 	tpSirAssocReq assoc_req, tpLimMlmAssocInd assoc_ind,
 	const uint8_t *wpsie)
 {
@@ -2249,7 +2249,7 @@ static void lim_fill_assoc_ind_wapi_info(tpAniSirGlobal mac_ctx,
  *
  * Return: None
  */
-static void lim_fill_assoc_ind_vht_info(tpAniSirGlobal mac_ctx,
+static void lim_fill_assoc_ind_vht_info(struct mac_context *mac_ctx,
 					struct pe_session *session_entry,
 					tpSirAssocReq assoc_req,
 					tpLimMlmAssocInd assoc_ind,
@@ -2381,7 +2381,7 @@ static void fill_mlm_assoc_ind_vht(tpSirAssocReq assocreq,
  *
  * Return: None
  */
-void lim_send_mlm_assoc_ind(tpAniSirGlobal mac_ctx,
+void lim_send_mlm_assoc_ind(struct mac_context *mac_ctx,
 	tpDphHashNode sta_ds, struct pe_session *session_entry)
 {
 	tpLimMlmAssocInd assoc_ind = NULL;

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

@@ -44,7 +44,7 @@
 #include "lim_send_messages.h"
 #include "lim_process_fils.h"
 
-extern QDF_STATUS sch_beacon_edca_process(tpAniSirGlobal mac,
+extern QDF_STATUS sch_beacon_edca_process(struct mac_context *mac,
 	tSirMacEdcaParamSetIE *edca, struct pe_session *pe_session);
 
 /**
@@ -60,7 +60,7 @@ extern QDF_STATUS sch_beacon_edca_process(tpAniSirGlobal mac,
  *
  * Return: None
  */
-static void lim_update_stads_htcap(tpAniSirGlobal mac_ctx,
+static void lim_update_stads_htcap(struct mac_context *mac_ctx,
 		tpDphHashNode sta_ds, tpSirAssocRsp assoc_rsp,
 		struct pe_session *session_entry)
 {
@@ -138,7 +138,7 @@ static void lim_update_stads_htcap(tpAniSirGlobal mac_ctx,
  *
  * Return: None
  */
-void lim_update_assoc_sta_datas(tpAniSirGlobal mac_ctx,
+void lim_update_assoc_sta_datas(struct mac_context *mac_ctx,
 	tpDphHashNode sta_ds, tpSirAssocRsp assoc_rsp,
 	struct pe_session *session_entry)
 {
@@ -290,7 +290,7 @@ void lim_update_assoc_sta_datas(tpAniSirGlobal mac_ctx,
  *
  * Return: None
  */
-static void lim_update_ric_data(tpAniSirGlobal mac_ctx,
+static void lim_update_ric_data(struct mac_context *mac_ctx,
 	 struct pe_session *session_entry, tpSirAssocRsp assoc_rsp)
 {
 	if (session_entry->ricData != NULL) {
@@ -333,7 +333,7 @@ static void lim_update_ric_data(tpAniSirGlobal mac_ctx,
  *
  * Return: None
  */
-static void lim_update_ese_tspec(tpAniSirGlobal mac_ctx,
+static void lim_update_ese_tspec(struct mac_context *mac_ctx,
 	 struct pe_session *session_entry, tpSirAssocRsp assoc_rsp)
 {
 	if (session_entry->tspecIes != NULL) {
@@ -377,7 +377,7 @@ static void lim_update_ese_tspec(tpAniSirGlobal mac_ctx,
  *
  * Return: None
  */
-static void lim_update_ese_tsm(tpAniSirGlobal mac_ctx,
+static void lim_update_ese_tsm(struct mac_context *mac_ctx,
 	 struct pe_session *session_entry, tpSirAssocRsp assoc_rsp)
 {
 	uint8_t cnt = 0;
@@ -424,7 +424,7 @@ static void lim_update_ese_tsm(tpAniSirGlobal mac_ctx,
  *
  * Return: None
  */
-static void lim_update_stads_ext_cap(tpAniSirGlobal mac_ctx,
+static void lim_update_stads_ext_cap(struct mac_context *mac_ctx,
 	struct pe_session *session_entry, tpSirAssocRsp assoc_rsp,
 	tpDphHashNode sta_ds)
 {
@@ -461,7 +461,7 @@ static void lim_update_stads_ext_cap(tpAniSirGlobal mac_ctx,
  *
  *  Return: None
  */
-static void lim_stop_reassoc_retry_timer(tpAniSirGlobal mac_ctx)
+static void lim_stop_reassoc_retry_timer(struct mac_context *mac_ctx)
 {
 	mac_ctx->lim.reAssocRetryAttempt = 0;
 	if ((NULL != mac_ctx->lim.pe_session)
@@ -488,7 +488,7 @@ static void lim_stop_reassoc_retry_timer(tpAniSirGlobal mac_ctx)
  */
 
 void
-lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx,
+lim_process_assoc_rsp_frame(struct mac_context *mac_ctx,
 	uint8_t *rx_pkt_info, uint8_t subtype, struct pe_session *session_entry)
 {
 	uint8_t *body;

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

@@ -69,7 +69,7 @@
  * @return 0 or 1 (Valid)
  */
 
-static inline unsigned int is_auth_valid(tpAniSirGlobal mac,
+static inline unsigned int is_auth_valid(struct mac_context *mac,
 					 tpSirMacAuthFrameBody auth,
 					 struct pe_session *pe_session)
 {
@@ -94,7 +94,7 @@ static inline unsigned int is_auth_valid(tpAniSirGlobal mac,
 	return valid;
 }
 
-static void lim_process_auth_shared_system_algo(tpAniSirGlobal mac_ctx,
+static void lim_process_auth_shared_system_algo(struct mac_context *mac_ctx,
 		tpSirMacMgmtHdr mac_hdr,
 		tSirMacAuthFrameBody *rx_auth_frm_body,
 		tSirMacAuthFrameBody *auth_frame,
@@ -235,7 +235,7 @@ static void lim_process_auth_shared_system_algo(tpAniSirGlobal mac_ctx,
 	}
 }
 
-static void lim_process_auth_open_system_algo(tpAniSirGlobal mac_ctx,
+static void lim_process_auth_open_system_algo(struct mac_context *mac_ctx,
 		tpSirMacMgmtHdr mac_hdr,
 		tSirMacAuthFrameBody *rx_auth_frm_body,
 		tSirMacAuthFrameBody *auth_frame,
@@ -286,7 +286,7 @@ static void lim_process_auth_open_system_algo(tpAniSirGlobal mac_ctx,
  *
  * Return: None
  */
-static void lim_process_sae_auth_frame(tpAniSirGlobal mac_ctx,
+static void lim_process_sae_auth_frame(struct mac_context *mac_ctx,
 		uint8_t *rx_pkt_info, struct pe_session *pe_session)
 {
 	tpSirMacMgmtHdr mac_hdr;
@@ -311,12 +311,12 @@ static void lim_process_sae_auth_frame(tpAniSirGlobal mac_ctx,
 			WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info));
 }
 #else
-static inline void  lim_process_sae_auth_frame(tpAniSirGlobal mac_ctx,
+static inline void  lim_process_sae_auth_frame(struct mac_context *mac_ctx,
 		uint8_t *rx_pkt_info, struct pe_session *pe_session)
 {}
 #endif
 
-static void lim_process_auth_frame_type1(tpAniSirGlobal mac_ctx,
+static void lim_process_auth_frame_type1(struct mac_context *mac_ctx,
 		tpSirMacMgmtHdr mac_hdr,
 		tSirMacAuthFrameBody *rx_auth_frm_body,
 		uint8_t *rx_pkt_info, uint16_t curr_seq_num,
@@ -555,7 +555,7 @@ static void lim_process_auth_frame_type1(tpAniSirGlobal mac_ctx,
 	}
 }
 
-static void lim_process_auth_frame_type2(tpAniSirGlobal mac_ctx,
+static void lim_process_auth_frame_type2(struct mac_context *mac_ctx,
 		tpSirMacMgmtHdr mac_hdr,
 		tSirMacAuthFrameBody *rx_auth_frm_body,
 		tSirMacAuthFrameBody *auth_frame,
@@ -820,7 +820,7 @@ static void lim_process_auth_frame_type2(tpAniSirGlobal mac_ctx,
 	}
 }
 
-static void lim_process_auth_frame_type3(tpAniSirGlobal mac_ctx,
+static void lim_process_auth_frame_type3(struct mac_context *mac_ctx,
 		tpSirMacMgmtHdr mac_hdr,
 		tSirMacAuthFrameBody *rx_auth_frm_body,
 		tSirMacAuthFrameBody *auth_frame,
@@ -981,7 +981,7 @@ static void lim_process_auth_frame_type3(tpAniSirGlobal mac_ctx,
 	}
 }
 
-static void lim_process_auth_frame_type4(tpAniSirGlobal mac_ctx,
+static void lim_process_auth_frame_type4(struct mac_context *mac_ctx,
 		tpSirMacMgmtHdr mac_hdr,
 		tSirMacAuthFrameBody *rx_auth_frm_body,
 		struct pe_session *pe_session)
@@ -1115,7 +1115,7 @@ static void lim_process_auth_frame_type4(tpAniSirGlobal mac_ctx,
  * Return: None
  */
 void
-lim_process_auth_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
+lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 		       struct pe_session *pe_session)
 {
 	uint8_t *body_ptr, key_id, cfg_privacy_opt_imp;
@@ -1508,7 +1508,7 @@ free:
  * is received we will have a session in progress. !!!!!
  ***----------------------------------------------------------------------
  */
-QDF_STATUS lim_process_auth_frame_no_session(tpAniSirGlobal mac, uint8_t *pBd,
+QDF_STATUS lim_process_auth_frame_no_session(struct mac_context *mac, uint8_t *pBd,
 						void *body)
 {
 	tpSirMacMgmtHdr pHdr;

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

@@ -55,7 +55,7 @@
  */
 
 void
-lim_process_beacon_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
+lim_process_beacon_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 			 struct pe_session *session)
 {
 	tpSirMacMgmtHdr mac_hdr;

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

@@ -37,9 +37,9 @@
 #include "sch_api.h"
 #include "rrm_api.h"
 
-static void lim_update_config(tpAniSirGlobal mac, struct pe_session *pe_session);
+static void lim_update_config(struct mac_context *mac, struct pe_session *pe_session);
 
-void lim_set_cfg_protection(tpAniSirGlobal mac, struct pe_session *pesessionEntry)
+void lim_set_cfg_protection(struct mac_context *mac, struct pe_session *pesessionEntry)
 {
 	uint32_t val = 0;
 	struct wlan_mlme_cfg *mlme_cfg = mac->mlme_cfg;
@@ -115,7 +115,7 @@ void lim_set_cfg_protection(tpAniSirGlobal mac, struct pe_session *pesessionEntr
  * @param  cfgId - ID of CFG parameter that got updated
  * @return None
  */
-void lim_handle_param_update(tpAniSirGlobal mac, eUpdateIEsType cfgId)
+void lim_handle_param_update(struct mac_context *mac, eUpdateIEsType cfgId)
 {
 	struct scheduler_msg msg = { 0 };
 	QDF_STATUS status;
@@ -157,7 +157,7 @@ void lim_handle_param_update(tpAniSirGlobal mac, eUpdateIEsType cfgId)
  * @return None
  */
 
-void lim_apply_configuration(tpAniSirGlobal mac, struct pe_session *pe_session)
+void lim_apply_configuration(struct mac_context *mac, struct pe_session *pe_session)
 {
 	uint32_t val = 0, phyMode;
 
@@ -211,7 +211,7 @@ void lim_apply_configuration(tpAniSirGlobal mac, struct pe_session *pe_session)
  * @return None
  */
 
-static void lim_update_config(tpAniSirGlobal mac, struct pe_session *pe_session)
+static void lim_update_config(struct mac_context *mac, struct pe_session *pe_session)
 {
 	uint32_t val;
 	bool enabled;

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

@@ -58,7 +58,7 @@
  */
 
 void
-lim_process_deauth_frame(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
+lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 			 struct pe_session *pe_session)
 {
 	uint8_t *pBody;
@@ -319,7 +319,7 @@ lim_process_deauth_frame(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
 
 } /*** end lim_process_deauth_frame() ***/
 
-void lim_perform_deauth(tpAniSirGlobal mac_ctx, struct pe_session *pe_session,
+void lim_perform_deauth(struct mac_context *mac_ctx, struct pe_session *pe_session,
 			uint16_t rc, tSirMacAddr addr, int32_t frame_rssi)
 {
 	tLimMlmDeauthInd mlmDeauthInd;

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

@@ -61,7 +61,7 @@
  * @return None
  */
 void
-lim_process_disassoc_frame(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
+lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 			   struct pe_session *pe_session)
 {
 	uint8_t *pBody;
@@ -315,7 +315,7 @@ lim_process_disassoc_frame(tpAniSirGlobal mac, uint8_t *pRxPacketInfo,
 } /*** end lim_process_disassoc_frame() ***/
 
 #ifdef FEATURE_WLAN_TDLS
-void lim_disassoc_tdls_peers(tpAniSirGlobal mac_ctx,
+void lim_disassoc_tdls_peers(struct mac_context *mac_ctx,
 				    struct pe_session *pe_session, tSirMacAddr addr)
 {
 	tpDphHashNode sta_ds;
@@ -341,7 +341,7 @@ void lim_disassoc_tdls_peers(tpAniSirGlobal mac_ctx,
 }
 #endif
 
-void lim_perform_disassoc(tpAniSirGlobal mac_ctx, int32_t frame_rssi,
+void lim_perform_disassoc(struct mac_context *mac_ctx, int32_t frame_rssi,
 			  uint16_t rc, struct pe_session *pe_session, tSirMacAddr addr)
 {
 	tLimMlmDisassocInd mlmDisassocInd;

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

@@ -791,7 +791,7 @@ static QDF_STATUS lim_process_auth_wrapped_data(struct pe_session *pe_session,
  *
  * Return: true if frame is valid or fils is disable, false otherwise
  */
-bool lim_is_valid_fils_auth_frame(tpAniSirGlobal mac_ctx,
+bool lim_is_valid_fils_auth_frame(struct mac_context *mac_ctx,
 		struct pe_session *pe_session,
 		tSirMacAuthFrameBody *rx_auth_frm_body)
 {
@@ -1059,7 +1059,7 @@ void lim_add_fils_data_to_auth_frame(struct pe_session *session,
  *
  * Return: true if fils data needs to be processed else false
  */
-bool lim_process_fils_auth_frame2(tpAniSirGlobal mac_ctx,
+bool lim_process_fils_auth_frame2(struct mac_context *mac_ctx,
 		struct pe_session *pe_session,
 		tSirMacAuthFrameBody *rx_auth_frm_body)
 {
@@ -1201,7 +1201,7 @@ void lim_update_fils_config(struct pe_session *session,
  *
  * Return: length of fils data
  */
-uint32_t lim_create_fils_auth_data(tpAniSirGlobal mac_ctx,
+uint32_t lim_create_fils_auth_data(struct mac_context *mac_ctx,
 		tpSirMacAuthFrameBody auth_frame,
 		struct pe_session *session)
 {
@@ -1238,7 +1238,7 @@ uint32_t lim_create_fils_auth_data(tpAniSirGlobal mac_ctx,
 	return frame_len;
 }
 
-void populate_fils_connect_params(tpAniSirGlobal mac_ctx,
+void populate_fils_connect_params(struct mac_context *mac_ctx,
 				  struct pe_session *session,
 				  tpSirSmeJoinRsp sme_join_rsp)
 {
@@ -1321,7 +1321,7 @@ void populate_fils_connect_params(tpAniSirGlobal mac_ctx,
  * Return: QDF_STATUS_SUCCESS if we parse GTK successfully,
  *         QDF_STATUS_E_FAILURE otherwise
  */
-static QDF_STATUS lim_parse_kde_elements(tpAniSirGlobal mac_ctx,
+static QDF_STATUS lim_parse_kde_elements(struct mac_context *mac_ctx,
 					 struct pe_fils_session *fils_info,
 					 uint8_t *kde_list,
 					 uint8_t kde_list_len)
@@ -1407,7 +1407,7 @@ static QDF_STATUS lim_parse_kde_elements(tpAniSirGlobal mac_ctx,
 	return QDF_STATUS_SUCCESS;
 }
 
-bool lim_verify_fils_params_assoc_rsp(tpAniSirGlobal mac_ctx,
+bool lim_verify_fils_params_assoc_rsp(struct mac_context *mac_ctx,
 				      struct pe_session *session_entry,
 				      tpSirAssocRsp assoc_rsp,
 				      tLimMlmAssocCnf *assoc_cnf)
@@ -1484,7 +1484,7 @@ verify_fils_params_fails:
  *
  * Return: QDF_STATUS_SUCCESS if found, else QDF_STATUS_E_FAILURE
  */
-static QDF_STATUS find_ie_data_after_fils_session_ie(tpAniSirGlobal mac_ctx,
+static QDF_STATUS find_ie_data_after_fils_session_ie(struct mac_context *mac_ctx,
 						     uint8_t *buf,
 						     uint32_t buf_len,
 						     uint8_t **ie,
@@ -1612,7 +1612,7 @@ error:
 	return ret;
 }
 
-QDF_STATUS aead_encrypt_assoc_req(tpAniSirGlobal mac_ctx,
+QDF_STATUS aead_encrypt_assoc_req(struct mac_context *mac_ctx,
 				  struct pe_session *pe_session,
 				  uint8_t *frm, uint32_t *frm_len)
 {
@@ -1770,7 +1770,7 @@ error:
 	return ret;
 }
 
-QDF_STATUS aead_decrypt_assoc_rsp(tpAniSirGlobal mac_ctx,
+QDF_STATUS aead_decrypt_assoc_rsp(struct mac_context *mac_ctx,
 				  struct pe_session *session,
 				  tDot11fAssocResponse *ar,
 				  uint8_t *p_frame, uint32_t *n_frame)

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

@@ -61,8 +61,8 @@
 #include <wlan_scan_ucfg_api.h>
 #include "wlan_mlme_public_struct.h"
 
-void lim_log_session_states(tpAniSirGlobal mac);
-static void lim_process_normal_hdd_msg(tpAniSirGlobal mac_ctx,
+void lim_log_session_states(struct mac_context *mac);
+static void lim_process_normal_hdd_msg(struct mac_context *mac_ctx,
 	struct scheduler_msg *msg, uint8_t rsp_reqd);
 
 #ifdef WLAN_FEATURE_SAE
@@ -73,7 +73,7 @@ static void lim_process_normal_hdd_msg(tpAniSirGlobal mac_ctx,
  *
  * Return: None
  */
-static void lim_process_sae_msg(tpAniSirGlobal mac, struct sir_sae_msg *body)
+static void lim_process_sae_msg(struct mac_context *mac, struct sir_sae_msg *body)
 {
 	struct sir_sae_msg *sae_msg = body;
 	struct pe_session *session;
@@ -126,7 +126,7 @@ static void lim_process_sae_msg(tpAniSirGlobal mac, struct sir_sae_msg *body)
 	}
 }
 #else
-static inline void lim_process_sae_msg(tpAniSirGlobal mac, void *body)
+static inline void lim_process_sae_msg(struct mac_context *mac, void *body)
 {}
 #endif
 
@@ -141,7 +141,7 @@ static inline void lim_process_sae_msg(tpAniSirGlobal mac, void *body)
  *
  * Return: None
  */
-static void lim_process_dual_mac_cfg_resp(tpAniSirGlobal mac, void *body)
+static void lim_process_dual_mac_cfg_resp(struct mac_context *mac, void *body)
 {
 	struct sir_dual_mac_config_resp *resp, *param;
 	uint32_t len, fail_resp = 0;
@@ -191,7 +191,7 @@ static void lim_process_dual_mac_cfg_resp(tpAniSirGlobal mac, void *body)
  *
  * Return: None
  */
-static void lim_process_set_hw_mode_resp(tpAniSirGlobal mac, void *body)
+static void lim_process_set_hw_mode_resp(struct mac_context *mac, void *body)
 {
 	struct sir_set_hw_mode_resp *resp, *param;
 	uint32_t len, i, fail_resp = 0;
@@ -253,7 +253,7 @@ static void lim_process_set_hw_mode_resp(tpAniSirGlobal mac, void *body)
  *
  * Return: None
  */
-static void lim_process_set_antenna_resp(tpAniSirGlobal mac, void *body)
+static void lim_process_set_antenna_resp(struct mac_context *mac, void *body)
 {
 	struct sir_antenna_mode_resp *resp, *param;
 	bool fail_resp = false;
@@ -298,7 +298,7 @@ static void lim_process_set_antenna_resp(tpAniSirGlobal mac, void *body)
  *
  * Return: None
  */
-static void lim_process_set_default_scan_ie_request(tpAniSirGlobal mac_ctx,
+static void lim_process_set_default_scan_ie_request(struct mac_context *mac_ctx,
 							uint32_t *msg_buf)
 {
 	struct hdd_default_scan_ie *set_ie_params;
@@ -361,7 +361,7 @@ scan_ie_send_fail:
  *
  * Return: None
  */
-static void lim_process_hw_mode_trans_ind(tpAniSirGlobal mac, void *body)
+static void lim_process_hw_mode_trans_ind(struct mac_context *mac, void *body)
 {
 	struct sir_hw_mode_trans_ind *ind, *param;
 	uint32_t len, i;
@@ -403,13 +403,13 @@ static void lim_process_hw_mode_trans_ind(tpAniSirGlobal mac, void *body)
 /** -------------------------------------------------------------
    \fn def_msg_decision
    \brief The function decides whether to defer a message or not in limProcessMessage function
-   \param   tpAniSirGlobal mac
+   \param   struct mac_context *mac
    \param       struct scheduler_msg  limMsg
    \param       tSirMacTspecIE   *ppInfo
    \return none
    -------------------------------------------------------------*/
 
-static uint8_t def_msg_decision(tpAniSirGlobal mac_ctx,
+static uint8_t def_msg_decision(struct mac_context *mac_ctx,
 				struct scheduler_msg *lim_msg)
 {
 	uint8_t type, subtype;
@@ -499,7 +499,7 @@ static uint8_t def_msg_decision(tpAniSirGlobal mac_ctx,
 
 #ifdef FEATURE_WLAN_EXTSCAN
 static void
-__lim_pno_match_fwd_bcn_probepsp(tpAniSirGlobal pmac, uint8_t *rx_pkt_info,
+__lim_pno_match_fwd_bcn_probepsp(struct mac_context *pmac, uint8_t *rx_pkt_info,
 				tSirProbeRespBeacon *frame, uint32_t ie_len,
 				uint32_t msg_type)
 {
@@ -555,7 +555,7 @@ __lim_pno_match_fwd_bcn_probepsp(tpAniSirGlobal pmac, uint8_t *rx_pkt_info,
 
 
 static void
-__lim_ext_scan_forward_bcn_probe_rsp(tpAniSirGlobal pmac, uint8_t *rx_pkt_info,
+__lim_ext_scan_forward_bcn_probe_rsp(struct mac_context *pmac, uint8_t *rx_pkt_info,
 					tSirProbeRespBeacon *frame,
 					uint32_t ie_len,
 					uint32_t msg_type)
@@ -617,7 +617,7 @@ __lim_ext_scan_forward_bcn_probe_rsp(tpAniSirGlobal pmac, uint8_t *rx_pkt_info,
 }
 
 static void
-__lim_process_ext_scan_beacon_probe_rsp(tpAniSirGlobal pmac,
+__lim_process_ext_scan_beacon_probe_rsp(struct mac_context *pmac,
 					uint8_t *rx_pkt_info,
 					uint8_t sub_type)
 {
@@ -684,7 +684,7 @@ __lim_process_ext_scan_beacon_probe_rsp(tpAniSirGlobal pmac,
  * Not Scanning,
  */
 static void
-__lim_handle_beacon(tpAniSirGlobal mac, struct scheduler_msg *pMsg,
+__lim_handle_beacon(struct mac_context *mac, struct scheduler_msg *pMsg,
 		    struct pe_session *pe_session)
 {
 	uint8_t *pRxPacketInfo;
@@ -757,7 +757,7 @@ static void lim_fill_sap_bcn_pkt_meta(struct scan_cache_entry *scan_entry,
  * Return: QDF_STATUS
  */
 static QDF_STATUS lim_allocate_and_get_bcn(
-				tpAniSirGlobal mac_ctx,
+				struct mac_context *mac_ctx,
 				cds_pkt_t **pkt,
 				uint8_t **rx_pkt_info,
 				tSchBeaconStruct **bcn,
@@ -816,7 +816,7 @@ free:
 void lim_handle_sap_beacon(struct wlan_objmgr_pdev *pdev,
 				struct scan_cache_entry *scan_entry)
 {
-	tpAniSirGlobal mac_ctx;
+	struct mac_context *mac_ctx;
 	cds_pkt_t *pkt = NULL;
 	tSchBeaconStruct *bcn = NULL;
 	struct mgmt_beacon_probe_filter *filter;
@@ -893,7 +893,7 @@ void lim_handle_sap_beacon(struct wlan_objmgr_pdev *pdev,
  * @return None
  */
 
-uint32_t lim_defer_msg(tpAniSirGlobal mac, struct scheduler_msg *pMsg)
+uint32_t lim_defer_msg(struct mac_context *mac, struct scheduler_msg *pMsg)
 {
 	uint32_t retCode = TX_SUCCESS;
 
@@ -924,7 +924,7 @@ uint32_t lim_defer_msg(tpAniSirGlobal mac, struct scheduler_msg *pMsg)
  *
  * Return:      None.
  */
-static void lim_handle_unknown_a2_index_frames(tpAniSirGlobal mac_ctx,
+static void lim_handle_unknown_a2_index_frames(struct mac_context *mac_ctx,
 	void *rx_pkt_buffer, struct pe_session *session_entry)
 {
 #ifdef FEATURE_WLAN_TDLS
@@ -971,7 +971,7 @@ static void lim_handle_unknown_a2_index_frames(tpAniSirGlobal mac_ctx,
  * Return:      True or False for Match or Mismatch respectively.
  */
 static bool
-lim_check_mgmt_registered_frames(tpAniSirGlobal mac_ctx, uint8_t *buff_desc,
+lim_check_mgmt_registered_frames(struct mac_context *mac_ctx, uint8_t *buff_desc,
 				 struct pe_session *session_entry)
 {
 	tSirMacFrameCtl fc;
@@ -1115,7 +1115,7 @@ lim_is_mgmt_frame_loggable(uint8_t type, uint8_t subtype)
  */
 
 static void
-lim_handle80211_frames(tpAniSirGlobal mac, struct scheduler_msg *limMsg,
+lim_handle80211_frames(struct mac_context *mac, struct scheduler_msg *limMsg,
 		       uint8_t *pDeferMsg)
 {
 	uint8_t *pRxPacketInfo = NULL;
@@ -1371,7 +1371,7 @@ end:
 	return;
 } /*** end lim_handle80211_frames() ***/
 
-void lim_process_abort_scan_ind(tpAniSirGlobal mac_ctx,
+void lim_process_abort_scan_ind(struct mac_context *mac_ctx,
 	uint8_t vdev_id, uint32_t scan_id, uint32_t scan_requestor_id)
 {
 	QDF_STATUS status;
@@ -1407,7 +1407,7 @@ fail:
 	wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_MAC_ID);
 }
 
-static void lim_process_sme_obss_scan_ind(tpAniSirGlobal mac_ctx,
+static void lim_process_sme_obss_scan_ind(struct mac_context *mac_ctx,
 					  struct scheduler_msg *msg)
 {
 	struct pe_session *session;
@@ -1447,7 +1447,7 @@ static void lim_process_sme_obss_scan_ind(tpAniSirGlobal mac_ctx,
  *
  * Return:  None.
  */
-static void lim_process_messages(tpAniSirGlobal mac_ctx,
+static void lim_process_messages(struct mac_context *mac_ctx,
 				 struct scheduler_msg *msg)
 {
 #ifdef FEATURE_AP_MCC_CH_AVOIDANCE
@@ -2061,7 +2061,7 @@ static void lim_process_messages(tpAniSirGlobal mac_ctx,
  * @return None
  */
 
-static void lim_process_deferred_message_queue(tpAniSirGlobal mac)
+static void lim_process_deferred_message_queue(struct mac_context *mac)
 {
 	struct scheduler_msg limMsg = {0};
 	struct scheduler_msg *readMsg;
@@ -2097,7 +2097,7 @@ static void lim_process_deferred_message_queue(tpAniSirGlobal mac)
  *
  * Return:  None.
  */
-void lim_message_processor(tpAniSirGlobal mac_ctx, struct scheduler_msg *msg)
+void lim_message_processor(struct mac_context *mac_ctx, struct scheduler_msg *msg)
 {
 	if (eLIM_MLM_OFFLINE_STATE == mac_ctx->lim.gLimMlmState) {
 		pe_free_msg(mac_ctx, msg);
@@ -2125,7 +2125,7 @@ void lim_message_processor(tpAniSirGlobal mac_ctx, struct scheduler_msg *msg)
  *
  * Return: None
  */
-static void lim_process_normal_hdd_msg(tpAniSirGlobal mac_ctx,
+static void lim_process_normal_hdd_msg(struct mac_context *mac_ctx,
 				       struct scheduler_msg *msg,
 				       uint8_t rsp_reqd)
 {
@@ -2256,7 +2256,7 @@ handle_ht_capabilityand_ht_info(struct mac_context *mac,
 	}
 }
 
-void lim_log_session_states(tpAniSirGlobal mac_ctx)
+void lim_log_session_states(struct mac_context *mac_ctx)
 {
 #ifdef WLAN_DEBUG
 	int i;

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

@@ -43,7 +43,7 @@
 #endif
 #include "wma_if.h"
 #include "rrm_api.h"
-static void lim_handle_sme_reaasoc_result(tpAniSirGlobal, tSirResultCodes,
+static void lim_handle_sme_reaasoc_result(struct mac_context *, tSirResultCodes,
 		uint16_t, struct pe_session *);
 /**
  * lim_process_mlm_reassoc_req() - process mlm reassoc request.
@@ -56,7 +56,7 @@ static void lim_handle_sme_reaasoc_result(tpAniSirGlobal, tSirResultCodes,
  *
  * Return: None
  */
-void lim_process_mlm_reassoc_req(tpAniSirGlobal mac_ctx,
+void lim_process_mlm_reassoc_req(struct mac_context *mac_ctx,
 				 tLimMlmReassocReq *reassoc_req)
 {
 	uint8_t channel, sec_ch_offset;
@@ -173,7 +173,7 @@ end:
  *
  * Return: None
  */
-static void lim_handle_sme_reaasoc_result(tpAniSirGlobal mac,
+static void lim_handle_sme_reaasoc_result(struct mac_context *mac,
 		tSirResultCodes resultCode, uint16_t protStatusCode,
 		struct pe_session *pe_session)
 {
@@ -232,7 +232,7 @@ error:
  *
  * @Return: void
  */
-void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
+void lim_process_mlm_reassoc_cnf(struct mac_context *mac_ctx, uint32_t *msg_buf)
 {
 	struct pe_session *session;
 	tLimMlmReassocCnf *lim_mlm_reassoc_cnf;
@@ -346,7 +346,7 @@ void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
  *
  *Return: None
  */
-void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal mac,
+void lim_process_sta_mlm_add_bss_rsp_ft(struct mac_context *mac,
 		struct scheduler_msg *limMsgQ, struct pe_session *pe_session)
 {
 	tLimMlmReassocCnf mlmReassocCnf; /* keep sme */
@@ -563,7 +563,7 @@ end:
 			     (uint32_t *) &mlmReassocCnf);
 }
 
-void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal mac,
+void lim_process_mlm_ft_reassoc_req(struct mac_context *mac,
 				    tLimMlmReassocReq *reassoc_req)
 {
 	uint8_t chanNum = 0;

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

@@ -41,15 +41,15 @@
 #include "lim_process_fils.h"
 #include "wlan_mlme_public_struct.h"
 
-static void lim_process_mlm_auth_req(tpAniSirGlobal, uint32_t *);
-static void lim_process_mlm_assoc_req(tpAniSirGlobal, uint32_t *);
-static void lim_process_mlm_disassoc_req(tpAniSirGlobal, uint32_t *);
-static void lim_process_mlm_set_keys_req(tpAniSirGlobal, uint32_t *);
+static void lim_process_mlm_auth_req(struct mac_context *, uint32_t *);
+static void lim_process_mlm_assoc_req(struct mac_context *, uint32_t *);
+static void lim_process_mlm_disassoc_req(struct mac_context *, uint32_t *);
+static void lim_process_mlm_set_keys_req(struct mac_context *, uint32_t *);
 
 /* MLM Timeout event handler templates */
-static void lim_process_auth_rsp_timeout(tpAniSirGlobal, uint32_t);
-static void lim_process_periodic_join_probe_req_timer(tpAniSirGlobal);
-static void lim_process_auth_retry_timer(tpAniSirGlobal);
+static void lim_process_auth_rsp_timeout(struct mac_context *, uint32_t);
+static void lim_process_periodic_join_probe_req_timer(struct mac_context *);
+static void lim_process_auth_retry_timer(struct mac_context *);
 
 /**
  * lim_process_sae_auth_timeout() - This function is called to process sae
@@ -58,7 +58,7 @@ static void lim_process_auth_retry_timer(tpAniSirGlobal);
  *
  * @Return: None
  */
-static void lim_process_sae_auth_timeout(tpAniSirGlobal mac_ctx)
+static void lim_process_sae_auth_timeout(struct mac_context *mac_ctx)
 {
 	struct pe_session *session;
 
@@ -111,7 +111,7 @@ static void lim_process_sae_auth_timeout(tpAniSirGlobal mac_ctx)
  *
  * Return: None
  */
-void lim_process_mlm_req_messages(tpAniSirGlobal mac_ctx,
+void lim_process_mlm_req_messages(struct mac_context *mac_ctx,
 				  struct scheduler_msg *msg)
 {
 	switch (msg->type) {
@@ -183,7 +183,7 @@ void lim_process_mlm_req_messages(tpAniSirGlobal mac_ctx,
  * Return: None
  */
 
-void lim_covert_channel_scan_type(tpAniSirGlobal mac_ctx, uint8_t chan_num,
+void lim_covert_channel_scan_type(struct mac_context *mac_ctx, uint8_t chan_num,
 				  bool passive_to_active)
 {
 
@@ -242,7 +242,7 @@ void lim_covert_channel_scan_type(tpAniSirGlobal mac_ctx, uint8_t chan_num,
  *
  * Return: None
  */
-void lim_set_dfs_channel_list(tpAniSirGlobal mac_ctx, uint8_t chan_num,
+void lim_set_dfs_channel_list(struct mac_context *mac_ctx, uint8_t chan_num,
 			      tSirDFSChannelList *dfs_ch_list)
 {
 	bool pass_to_active = true;
@@ -290,7 +290,7 @@ void lim_set_dfs_channel_list(tpAniSirGlobal mac_ctx, uint8_t chan_num,
  *
  * Return: None
  */
-static void mlm_add_sta(tpAniSirGlobal mac_ctx, tpAddStaParams sta_param,
+static void mlm_add_sta(struct mac_context *mac_ctx, tpAddStaParams sta_param,
 		uint8_t *bssid, uint8_t ht_capable, struct pe_session *session_entry)
 {
 	uint32_t val;
@@ -411,7 +411,7 @@ static void mlm_add_sta(tpAniSirGlobal mac_ctx, tpAddStaParams sta_param,
  * Return: eSIR_SME_SUCCESS on success, other error codes otherwise
  */
 tSirResultCodes
-lim_mlm_add_bss(tpAniSirGlobal mac_ctx,
+lim_mlm_add_bss(struct mac_context *mac_ctx,
 		tLimMlmStartReq *mlm_start_req, struct pe_session *session)
 {
 	struct scheduler_msg msg_buf = {0};
@@ -599,7 +599,7 @@ lim_mlm_add_bss(tpAniSirGlobal mac_ctx,
 	return eSIR_SME_SUCCESS;
 }
 
-void lim_process_mlm_start_req(tpAniSirGlobal mac_ctx,
+void lim_process_mlm_start_req(struct mac_context *mac_ctx,
 			       tLimMlmStartReq *mlm_start_req)
 {
 	tLimMlmStartCnf mlm_start_cnf;
@@ -661,7 +661,7 @@ end:
  *
  * Return: none
  */
-static void lim_post_join_set_link_state_callback(tpAniSirGlobal mac,
+static void lim_post_join_set_link_state_callback(struct mac_context *mac,
 		void *callback_arg, bool status)
 {
 	uint8_t chan_num, sec_chan_offset;
@@ -740,7 +740,7 @@ failure:
  * @Return None
  */
 static void
-lim_process_mlm_post_join_suspend_link(tpAniSirGlobal mac_ctx,
+lim_process_mlm_post_join_suspend_link(struct mac_context *mac_ctx,
 				       QDF_STATUS status,
 				       uint32_t *ctx)
 {
@@ -820,7 +820,7 @@ error:
  *
  * @Return: None
  */
-void lim_process_mlm_join_req(tpAniSirGlobal mac_ctx,
+void lim_process_mlm_join_req(struct mac_context *mac_ctx,
 			      tLimMlmJoinReq *mlm_join_req)
 {
 	tLimMlmJoinCnf mlmjoin_cnf;
@@ -902,7 +902,7 @@ error:
  *
  * Return: true if expected and false otherwise
  */
-static bool lim_is_auth_req_expected(tpAniSirGlobal mac_ctx,
+static bool lim_is_auth_req_expected(struct mac_context *mac_ctx,
 				     struct pe_session *session)
 {
 	bool flag = false;
@@ -942,7 +942,7 @@ static bool lim_is_auth_req_expected(tpAniSirGlobal mac_ctx,
  *
  * Return: true if exists and false otherwise
  */
-static bool lim_is_preauth_ctx_exists(tpAniSirGlobal mac_ctx,
+static bool lim_is_preauth_ctx_exists(struct mac_context *mac_ctx,
 				      struct pe_session *session,
 				      struct tLimPreAuthNode **preauth_node_ptr)
 {
@@ -983,7 +983,7 @@ static bool lim_is_preauth_ctx_exists(tpAniSirGlobal mac_ctx,
  *
  * Return: QDF_STATUS
  */
-static QDF_STATUS lim_process_mlm_auth_req_sae(tpAniSirGlobal mac_ctx,
+static QDF_STATUS lim_process_mlm_auth_req_sae(struct mac_context *mac_ctx,
 		struct pe_session *session)
 {
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
@@ -1042,7 +1042,7 @@ static QDF_STATUS lim_process_mlm_auth_req_sae(tpAniSirGlobal mac_ctx,
 	return qdf_status;
 }
 #else
-static QDF_STATUS lim_process_mlm_auth_req_sae(tpAniSirGlobal mac_ctx,
+static QDF_STATUS lim_process_mlm_auth_req_sae(struct mac_context *mac_ctx,
 		struct pe_session *session)
 {
 	return QDF_STATUS_E_NOSUPPORT;
@@ -1060,7 +1060,7 @@ static QDF_STATUS lim_process_mlm_auth_req_sae(tpAniSirGlobal mac_ctx,
  *
  * @Return: None
  */
-static void lim_process_mlm_auth_req(tpAniSirGlobal mac_ctx, uint32_t *msg)
+static void lim_process_mlm_auth_req(struct mac_context *mac_ctx, uint32_t *msg)
 {
 	uint32_t num_preauth_ctx;
 	tSirMacAddr curr_bssid;
@@ -1233,7 +1233,7 @@ end:
  * @Return None
  */
 
-static void lim_process_mlm_assoc_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
+static void lim_process_mlm_assoc_req(struct mac_context *mac_ctx, uint32_t *msg_buf)
 {
 	tSirMacAddr curr_bssId;
 	tLimMlmAssocReq *mlm_assoc_req;
@@ -1338,7 +1338,7 @@ end:
  * Return: None
  */
 static void
-lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx,
+lim_process_mlm_disassoc_req_ntf(struct mac_context *mac_ctx,
 				 QDF_STATUS suspend_status, uint32_t *msg)
 {
 	uint16_t aid;
@@ -1542,7 +1542,7 @@ end:
  *
  * Return: true if pending and false otherwise.
  */
-bool lim_check_disassoc_deauth_ack_pending(tpAniSirGlobal mac_ctx,
+bool lim_check_disassoc_deauth_ack_pending(struct mac_context *mac_ctx,
 					   uint8_t *sta_mac)
 {
 	tLimMlmDisassocReq *disassoc_req;
@@ -1575,7 +1575,7 @@ bool lim_check_disassoc_deauth_ack_pending(tpAniSirGlobal mac_ctx,
  *
  * Return: void
  */
-void lim_clean_up_disassoc_deauth_req(tpAniSirGlobal mac_ctx,
+void lim_clean_up_disassoc_deauth_req(struct mac_context *mac_ctx,
 				      uint8_t *sta_mac, bool clean_rx_path)
 {
 	tLimMlmDisassocReq *mlm_disassoc_req;
@@ -1630,7 +1630,7 @@ void lim_clean_up_disassoc_deauth_req(tpAniSirGlobal mac_ctx,
  *
  * Return: void
  */
-void lim_process_disassoc_ack_timeout(tpAniSirGlobal mac_ctx)
+void lim_process_disassoc_ack_timeout(struct mac_context *mac_ctx)
 {
 	lim_send_disassoc_cnf(mac_ctx);
 }
@@ -1647,7 +1647,7 @@ void lim_process_disassoc_ack_timeout(tpAniSirGlobal mac_ctx)
  * @Return: None
  */
 static void
-lim_process_mlm_disassoc_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
+lim_process_mlm_disassoc_req(struct mac_context *mac_ctx, uint32_t *msg_buf)
 {
 	tLimMlmDisassocReq *mlm_disassoc_req;
 
@@ -1678,7 +1678,7 @@ lim_process_mlm_disassoc_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
  * @Return: None
  */
 static void
-lim_process_mlm_deauth_req_ntf(tpAniSirGlobal mac_ctx,
+lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx,
 			       QDF_STATUS suspend_status, uint32_t *msg_buf)
 {
 	uint16_t aid;
@@ -1922,7 +1922,7 @@ end:
  *
  * Return: void
  */
-void lim_process_deauth_ack_timeout(tpAniSirGlobal mac_ctx)
+void lim_process_deauth_ack_timeout(struct mac_context *mac_ctx)
 {
 	lim_send_deauth_cnf(mac_ctx);
 }
@@ -1938,7 +1938,7 @@ void lim_process_deauth_ack_timeout(tpAniSirGlobal mac_ctx)
  *
  * @Return: None
  */
-void lim_process_mlm_deauth_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
+void lim_process_mlm_deauth_req(struct mac_context *mac_ctx, uint32_t *msg_buf)
 {
 	tLimMlmDeauthReq *mlm_deauth_req;
 	struct pe_session *session;
@@ -1978,7 +1978,7 @@ void lim_process_mlm_deauth_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
  * @Return: None
  */
 static void
-lim_process_mlm_set_keys_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
+lim_process_mlm_set_keys_req(struct mac_context *mac_ctx, uint32_t *msg_buf)
 {
 	uint16_t aid;
 	uint16_t sta_idx = 0;
@@ -2158,7 +2158,7 @@ end:
 	lim_post_sme_set_keys_cnf(mac_ctx, mlm_set_keys_req, &mlm_set_keys_cnf);
 }
 
-void lim_process_join_failure_timeout(tpAniSirGlobal mac_ctx)
+void lim_process_join_failure_timeout(struct mac_context *mac_ctx)
 {
 	tLimMlmJoinCnf mlm_join_cnf;
 	uint32_t len;
@@ -2226,7 +2226,7 @@ void lim_process_join_failure_timeout(tpAniSirGlobal mac_ctx)
  *
  * @Return None
  */
-static void lim_process_periodic_join_probe_req_timer(tpAniSirGlobal mac_ctx)
+static void lim_process_periodic_join_probe_req_timer(struct mac_context *mac_ctx)
 {
 	struct pe_session *session;
 	tSirMacSSid ssid;
@@ -2271,7 +2271,7 @@ static void lim_process_periodic_join_probe_req_timer(tpAniSirGlobal mac_ctx)
  * Return: void
  */
 
-static void lim_process_auth_retry_timer(tpAniSirGlobal mac_ctx)
+static void lim_process_auth_retry_timer(struct mac_context *mac_ctx)
 {
 	struct pe_session * session_entry;
 
@@ -2323,7 +2323,7 @@ static void lim_process_auth_retry_timer(tpAniSirGlobal mac_ctx)
 	return;
 } /*** lim_process_auth_retry_timer() ***/
 
-void lim_process_auth_failure_timeout(tpAniSirGlobal mac_ctx)
+void lim_process_auth_failure_timeout(struct mac_context *mac_ctx)
 {
 	/* fetch the pe_session based on the sessionId */
 	struct pe_session *session;
@@ -2401,7 +2401,7 @@ void lim_process_auth_failure_timeout(tpAniSirGlobal mac_ctx)
  * @Return: None
  */
 static void
-lim_process_auth_rsp_timeout(tpAniSirGlobal mac_ctx, uint32_t auth_idx)
+lim_process_auth_rsp_timeout(struct mac_context *mac_ctx, uint32_t auth_idx)
 {
 	struct tLimPreAuthNode *auth_node;
 	struct pe_session *session;
@@ -2446,7 +2446,7 @@ lim_process_auth_rsp_timeout(tpAniSirGlobal mac_ctx, uint32_t auth_idx)
 	}
 }
 
-void lim_process_assoc_failure_timeout(tpAniSirGlobal mac_ctx,
+void lim_process_assoc_failure_timeout(struct mac_context *mac_ctx,
 						     uint32_t msg_type)
 {
 
@@ -2585,7 +2585,7 @@ void lim_process_assoc_failure_timeout(tpAniSirGlobal mac_ctx,
  *
  * @Return: None
  */
-void lim_set_channel(tpAniSirGlobal mac_ctx, uint8_t channel,
+void lim_set_channel(struct mac_context *mac_ctx, uint8_t channel,
 		     uint8_t ch_center_freq_seg0, uint8_t ch_center_freq_seg1,
 		     enum phy_ch_width ch_width, int8_t max_tx_power,
 		     uint8_t pe_session_id, uint32_t cac_duration_ms,

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

@@ -45,18 +45,18 @@
 
 #define MAX_SUPPORTED_PEERS_WEP 16
 
-void lim_process_mlm_join_cnf(tpAniSirGlobal, uint32_t *);
-void lim_process_mlm_auth_cnf(tpAniSirGlobal, uint32_t *);
-void lim_process_mlm_assoc_ind(tpAniSirGlobal, uint32_t *);
-void lim_process_mlm_assoc_cnf(tpAniSirGlobal, uint32_t *);
-void lim_process_mlm_reassoc_ind(tpAniSirGlobal, uint32_t *);
-void lim_process_mlm_set_keys_cnf(tpAniSirGlobal, uint32_t *);
-void lim_process_mlm_disassoc_ind(tpAniSirGlobal, uint32_t *);
-void lim_process_mlm_disassoc_cnf(tpAniSirGlobal, uint32_t *);
-static void lim_process_mlm_deauth_ind(tpAniSirGlobal, tLimMlmDeauthInd *);
-void lim_process_mlm_deauth_cnf(tpAniSirGlobal, uint32_t *);
-void lim_process_mlm_purge_sta_ind(tpAniSirGlobal, uint32_t *);
-void lim_get_session_info(tpAniSirGlobal mac, uint8_t *, uint8_t *,
+void lim_process_mlm_join_cnf(struct mac_context *, uint32_t *);
+void lim_process_mlm_auth_cnf(struct mac_context *, uint32_t *);
+void lim_process_mlm_assoc_ind(struct mac_context *, uint32_t *);
+void lim_process_mlm_assoc_cnf(struct mac_context *, uint32_t *);
+void lim_process_mlm_reassoc_ind(struct mac_context *, uint32_t *);
+void lim_process_mlm_set_keys_cnf(struct mac_context *, uint32_t *);
+void lim_process_mlm_disassoc_ind(struct mac_context *, uint32_t *);
+void lim_process_mlm_disassoc_cnf(struct mac_context *, uint32_t *);
+static void lim_process_mlm_deauth_ind(struct mac_context *, tLimMlmDeauthInd *);
+void lim_process_mlm_deauth_cnf(struct mac_context *, uint32_t *);
+void lim_process_mlm_purge_sta_ind(struct mac_context *, uint32_t *);
+void lim_get_session_info(struct mac_context *mac, uint8_t *, uint8_t *,
 				uint16_t *);
 /**
  * lim_process_mlm_rsp_messages()
@@ -78,7 +78,7 @@ void lim_get_session_info(tpAniSirGlobal mac, uint8_t *, uint8_t *,
  * @return None
  */
 void
-lim_process_mlm_rsp_messages(tpAniSirGlobal mac, uint32_t msgType,
+lim_process_mlm_rsp_messages(struct mac_context *mac, uint32_t msgType,
 			     uint32_t *pMsgBuf)
 {
 
@@ -150,7 +150,7 @@ lim_process_mlm_rsp_messages(tpAniSirGlobal mac, uint32_t msgType,
  *
  * @return None
  */
-void lim_process_mlm_start_cnf(tpAniSirGlobal mac, uint32_t *pMsgBuf)
+void lim_process_mlm_start_cnf(struct mac_context *mac, uint32_t *pMsgBuf)
 {
 	struct pe_session *pe_session = NULL;
 	tLimMlmStartCnf *pLimMlmStartCnf;
@@ -264,7 +264,7 @@ void lim_process_mlm_start_cnf(tpAniSirGlobal mac, uint32_t *pMsgBuf)
  *
  * Return: None
  */
-void lim_process_mlm_join_cnf(tpAniSirGlobal mac_ctx,
+void lim_process_mlm_join_cnf(struct mac_context *mac_ctx,
 	uint32_t *msg)
 {
 	tSirResultCodes result_code;
@@ -325,7 +325,7 @@ void lim_process_mlm_join_cnf(tpAniSirGlobal mac_ctx,
  * Return: None
  */
 
-static void lim_send_mlm_assoc_req(tpAniSirGlobal mac_ctx,
+static void lim_send_mlm_assoc_req(struct mac_context *mac_ctx,
 	struct pe_session *session_entry)
 {
 	tLimMlmAssocReq *assoc_req;
@@ -430,7 +430,7 @@ static void lim_send_mlm_assoc_req(tpAniSirGlobal mac_ctx,
 void lim_pmf_comeback_timer_callback(void *context)
 {
 	struct comeback_timer_info *info = context;
-	tpAniSirGlobal mac_ctx = info->mac;
+	struct mac_context *mac_ctx = info->mac;
 	struct pe_session *pe_session = &mac_ctx->lim.gpSession[info->session_id];
 
 	pe_err("comeback later timer expired. sending MLM ASSOC req");
@@ -451,7 +451,7 @@ void lim_pmf_comeback_timer_callback(void *context)
  *
  * Return: None
  */
-void lim_process_mlm_auth_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg)
+void lim_process_mlm_auth_cnf(struct mac_context *mac_ctx, uint32_t *msg)
 {
 	tAniAuthType auth_type, auth_mode;
 	tLimMlmAuthReq *auth_req;
@@ -590,7 +590,7 @@ void lim_process_mlm_auth_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg)
  *
  * Return: None
  */
-void lim_process_mlm_assoc_cnf(tpAniSirGlobal mac_ctx,
+void lim_process_mlm_assoc_cnf(struct mac_context *mac_ctx,
 	uint32_t *msg)
 {
 	struct pe_session *session_entry;
@@ -679,7 +679,7 @@ void lim_process_mlm_assoc_cnf(tpAniSirGlobal mac_ctx,
  */
 
 static void
-lim_fill_assoc_ind_params(tpAniSirGlobal mac_ctx,
+lim_fill_assoc_ind_params(struct mac_context *mac_ctx,
 	tpLimMlmAssocInd assoc_ind, tSirSmeAssocInd *sme_assoc_ind,
 	struct pe_session *session_entry)
 {
@@ -778,7 +778,7 @@ lim_fill_assoc_ind_params(tpAniSirGlobal mac_ctx,
  *
  * @return None
  */
-void lim_process_mlm_assoc_ind(tpAniSirGlobal mac, uint32_t *pMsgBuf)
+void lim_process_mlm_assoc_ind(struct mac_context *mac, uint32_t *pMsgBuf)
 {
 	uint32_t len;
 	struct scheduler_msg msg = {0};
@@ -860,7 +860,7 @@ void lim_process_mlm_assoc_ind(tpAniSirGlobal mac, uint32_t *pMsgBuf)
  *
  * @return None
  */
-void lim_process_mlm_disassoc_ind(tpAniSirGlobal mac, uint32_t *pMsgBuf)
+void lim_process_mlm_disassoc_ind(struct mac_context *mac, uint32_t *pMsgBuf)
 {
 	tLimMlmDisassocInd *pMlmDisassocInd;
 	struct pe_session *pe_session;
@@ -900,7 +900,7 @@ void lim_process_mlm_disassoc_ind(tpAniSirGlobal mac, uint32_t *pMsgBuf)
  *
  * Return: None
  */
-void lim_process_mlm_disassoc_cnf(tpAniSirGlobal mac_ctx,
+void lim_process_mlm_disassoc_cnf(struct mac_context *mac_ctx,
 	uint32_t *msg)
 {
 	tSirResultCodes result_code;
@@ -981,7 +981,7 @@ void lim_process_mlm_disassoc_cnf(tpAniSirGlobal mac_ctx,
  *
  * Return: None
  */
-static void lim_process_mlm_deauth_ind(tpAniSirGlobal mac_ctx,
+static void lim_process_mlm_deauth_ind(struct mac_context *mac_ctx,
 				       tLimMlmDeauthInd *deauth_ind)
 {
 	struct pe_session *session;
@@ -1028,7 +1028,7 @@ static void lim_process_mlm_deauth_ind(tpAniSirGlobal mac_ctx,
  *
  * @return None
  */
-void lim_process_mlm_deauth_cnf(tpAniSirGlobal mac, uint32_t *pMsgBuf)
+void lim_process_mlm_deauth_cnf(struct mac_context *mac, uint32_t *pMsgBuf)
 {
 	uint16_t aid;
 	tSirResultCodes resultCode;
@@ -1106,7 +1106,7 @@ void lim_process_mlm_deauth_cnf(tpAniSirGlobal mac, uint32_t *pMsgBuf)
  *
  * @return None
  */
-void lim_process_mlm_purge_sta_ind(tpAniSirGlobal mac, uint32_t *pMsgBuf)
+void lim_process_mlm_purge_sta_ind(struct mac_context *mac, uint32_t *pMsgBuf)
 {
 	tSirResultCodes resultCode;
 	tpLimMlmPurgeStaInd pMlmPurgeStaInd;
@@ -1192,7 +1192,7 @@ void lim_process_mlm_purge_sta_ind(tpAniSirGlobal mac, uint32_t *pMsgBuf)
  *
  * @return None
  */
-void lim_process_mlm_set_keys_cnf(tpAniSirGlobal mac, uint32_t *pMsgBuf)
+void lim_process_mlm_set_keys_cnf(struct mac_context *mac, uint32_t *pMsgBuf)
 {
 	/* Prepare and send SME_SETCONTEXT_RSP message */
 	tLimMlmSetKeysCnf *pMlmSetKeysCnf;
@@ -1249,7 +1249,7 @@ void lim_process_mlm_set_keys_cnf(tpAniSirGlobal mac, uint32_t *pMsgBuf)
  *
  * Return: None
  */
-static void lim_join_result_callback(tpAniSirGlobal mac, void *param,
+static void lim_join_result_callback(struct mac_context *mac, void *param,
 				     bool status)
 {
 	join_params *link_state_params = (join_params *) param;
@@ -1281,7 +1281,7 @@ static void lim_join_result_callback(tpAniSirGlobal mac, void *param,
 QDF_STATUS lim_sta_send_down_link(join_params *param)
 {
 	struct pe_session *session;
-	tpAniSirGlobal mac_ctx;
+	struct mac_context *mac_ctx;
 	tpDphHashNode sta_ds = NULL;
 
 	if (!param) {
@@ -1381,7 +1381,7 @@ error:
  *
  * Return: None
  */
-void lim_handle_sme_join_result(tpAniSirGlobal mac_ctx,
+void lim_handle_sme_join_result(struct mac_context *mac_ctx,
 	tSirResultCodes result_code, uint16_t prot_status_code,
 	struct pe_session *session)
 {
@@ -1410,7 +1410,7 @@ void lim_handle_sme_join_result(tpAniSirGlobal mac_ctx,
 	return;
 }
 #else
-void lim_handle_sme_join_result(tpAniSirGlobal mac_ctx,
+void lim_handle_sme_join_result(struct mac_context *mac_ctx,
 	tSirResultCodes result_code, uint16_t prot_status_code,
 	struct pe_session *session_entry)
 {
@@ -1511,7 +1511,7 @@ error:
  *
  * @return None
  */
-void lim_process_mlm_add_sta_rsp(tpAniSirGlobal mac,
+void lim_process_mlm_add_sta_rsp(struct mac_context *mac,
 				 struct scheduler_msg *limMsgQ,
 				 struct pe_session *pe_session)
 {
@@ -1538,7 +1538,7 @@ void lim_process_mlm_add_sta_rsp(tpAniSirGlobal mac,
  * Return: Null
  */
 
-void lim_process_sta_mlm_add_sta_rsp(tpAniSirGlobal mac_ctx,
+void lim_process_sta_mlm_add_sta_rsp(struct mac_context *mac_ctx,
 	struct scheduler_msg *msg, struct pe_session *session_entry)
 {
 	tLimMlmAssocCnf mlm_assoc_cnf;
@@ -1685,7 +1685,7 @@ end:
 	return;
 }
 
-void lim_process_mlm_del_bss_rsp(tpAniSirGlobal mac,
+void lim_process_mlm_del_bss_rsp(struct mac_context *mac,
 				 struct scheduler_msg *limMsgQ,
 				 struct pe_session *pe_session)
 {
@@ -1712,7 +1712,7 @@ void lim_process_mlm_del_bss_rsp(tpAniSirGlobal mac,
 #endif
 }
 
-void lim_process_sta_mlm_del_bss_rsp(tpAniSirGlobal mac,
+void lim_process_sta_mlm_del_bss_rsp(struct mac_context *mac,
 				     struct scheduler_msg *limMsgQ,
 				     struct pe_session *pe_session)
 {
@@ -1780,7 +1780,7 @@ end:
 	return;
 }
 
-void lim_process_ap_mlm_del_bss_rsp(tpAniSirGlobal mac,
+void lim_process_ap_mlm_del_bss_rsp(struct mac_context *mac,
 				    struct scheduler_msg *limMsgQ,
 				    struct pe_session *pe_session)
 {
@@ -1856,7 +1856,7 @@ end:
  *
  * Return: None
  */
-void lim_process_mlm_del_sta_rsp(tpAniSirGlobal mac_ctx,
+void lim_process_mlm_del_sta_rsp(struct mac_context *mac_ctx,
 	struct scheduler_msg *msg)
 {
 	/*
@@ -1913,7 +1913,7 @@ void lim_process_mlm_del_sta_rsp(tpAniSirGlobal mac_ctx,
  *
  * Retunrn: None
  */
-void lim_process_ap_mlm_del_sta_rsp(tpAniSirGlobal mac_ctx,
+void lim_process_ap_mlm_del_sta_rsp(struct mac_context *mac_ctx,
 					   struct scheduler_msg *msg,
 					   struct pe_session *session_entry)
 {
@@ -2007,7 +2007,7 @@ end:
 	return;
 }
 
-void lim_process_sta_mlm_del_sta_rsp(tpAniSirGlobal mac,
+void lim_process_sta_mlm_del_sta_rsp(struct mac_context *mac,
 				     struct scheduler_msg *limMsgQ,
 				     struct pe_session *pe_session)
 {
@@ -2085,7 +2085,7 @@ end:
 	return;
 }
 
-void lim_process_ap_mlm_add_sta_rsp(tpAniSirGlobal mac,
+void lim_process_ap_mlm_add_sta_rsp(struct mac_context *mac,
 				    struct scheduler_msg *limMsgQ,
 				    struct pe_session *pe_session)
 {
@@ -2181,7 +2181,7 @@ end:
  *
  * @return None
  */
-static void lim_process_ap_mlm_add_bss_rsp(tpAniSirGlobal mac,
+static void lim_process_ap_mlm_add_bss_rsp(struct mac_context *mac,
 					   struct scheduler_msg *limMsgQ)
 {
 	tLimMlmStartCnf mlmStartCnf;
@@ -2328,7 +2328,7 @@ end:
  * @return None
  */
 static void
-lim_process_ibss_mlm_add_bss_rsp(tpAniSirGlobal mac,
+lim_process_ibss_mlm_add_bss_rsp(struct mac_context *mac,
 				 struct scheduler_msg *limMsgQ,
 				 struct pe_session *pe_session)
 {
@@ -2427,7 +2427,7 @@ static void lim_update_fils_auth_mode(struct pe_session *session_entry,
  * Return: Null
  */
 static void
-lim_process_sta_add_bss_rsp_pre_assoc(tpAniSirGlobal mac_ctx,
+lim_process_sta_add_bss_rsp_pre_assoc(struct mac_context *mac_ctx,
 	struct scheduler_msg *msg, struct pe_session *session_entry)
 {
 	tpAddBssParams pAddBssParams = (tpAddBssParams) msg->bodyptr;
@@ -2531,7 +2531,7 @@ joinFailure:
  * Return: None
  */
 static void
-lim_process_sta_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx,
+lim_process_sta_mlm_add_bss_rsp(struct mac_context *mac_ctx,
 	struct scheduler_msg *msg, struct pe_session *session_entry)
 {
 	tpAddBssParams add_bss_params = (tpAddBssParams) msg->bodyptr;
@@ -2687,7 +2687,7 @@ end:
  *
  * Return None
  */
-void lim_process_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx,
+void lim_process_mlm_add_bss_rsp(struct mac_context *mac_ctx,
 	struct scheduler_msg *msg)
 {
 	tLimMlmStartCnf mlm_start_cnf;
@@ -2764,7 +2764,7 @@ void lim_process_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx,
 #endif
 }
 
-void lim_process_mlm_update_hidden_ssid_rsp(tpAniSirGlobal mac_ctx,
+void lim_process_mlm_update_hidden_ssid_rsp(struct mac_context *mac_ctx,
 	struct scheduler_msg *msg)
 {
 	struct pe_session *session_entry;
@@ -2826,7 +2826,7 @@ free_req:
  *
  * Return: None
  */
-void lim_process_mlm_set_sta_key_rsp(tpAniSirGlobal mac_ctx,
+void lim_process_mlm_set_sta_key_rsp(struct mac_context *mac_ctx,
 	struct scheduler_msg *msg)
 {
 	uint8_t resp_reqd = 1;
@@ -2911,7 +2911,7 @@ void lim_process_mlm_set_sta_key_rsp(tpAniSirGlobal mac_ctx,
  *
  * Return: NULL
  */
-void lim_process_mlm_set_bss_key_rsp(tpAniSirGlobal mac_ctx,
+void lim_process_mlm_set_bss_key_rsp(struct mac_context *mac_ctx,
 	struct scheduler_msg *msg)
 {
 	struct sLimMlmSetKeysCnf set_key_cnf;
@@ -3018,7 +3018,7 @@ void lim_process_mlm_set_bss_key_rsp(tpAniSirGlobal mac_ctx,
  *
  * @return None
  */
-static void lim_process_switch_channel_re_assoc_req(tpAniSirGlobal mac,
+static void lim_process_switch_channel_re_assoc_req(struct mac_context *mac,
 						    struct pe_session *pe_session,
 						    QDF_STATUS status)
 {
@@ -3086,7 +3086,7 @@ end:
  * Return None
  */
 static void lim_process_switch_channel_join_req(
-	tpAniSirGlobal mac_ctx, struct pe_session *session_entry,
+	struct mac_context *mac_ctx, struct pe_session *session_entry,
 	QDF_STATUS status)
 {
 	tSirMacSSid ssId;
@@ -3231,7 +3231,7 @@ error:
  *
  * @return None
  */
-void lim_process_switch_channel_rsp(tpAniSirGlobal mac, void *body)
+void lim_process_switch_channel_rsp(struct mac_context *mac, void *body)
 {
 	tpSwitchChannelParams pChnlParams = NULL;
 	QDF_STATUS status;
@@ -3320,7 +3320,7 @@ free:
 	qdf_mem_free(body);
 }
 
-QDF_STATUS lim_send_beacon_ind(tpAniSirGlobal mac, struct pe_session *pe_session,
+QDF_STATUS lim_send_beacon_ind(struct mac_context *mac, struct pe_session *pe_session,
 			       enum sir_bcn_update_reason reason)
 {
 	tBeaconGenParams *pBeaconGenParams = NULL;
@@ -3341,7 +3341,7 @@ QDF_STATUS lim_send_beacon_ind(tpAniSirGlobal mac, struct pe_session *pe_session
 	return sch_process_pre_beacon_ind(mac, &limMsg, reason);
 }
 
-void lim_process_rx_channel_status_event(tpAniSirGlobal mac_ctx, void *buf)
+void lim_process_rx_channel_status_event(struct mac_context *mac_ctx, void *buf)
 {
 	struct lim_channel_status *chan_status = buf;
 

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

@@ -43,7 +43,7 @@
 
 void
 
-lim_send_sme_probe_req_ind(tpAniSirGlobal mac,
+lim_send_sme_probe_req_ind(struct mac_context *mac,
 			   tSirMacAddr peerMacAddr,
 			   uint8_t *pProbeReqIE,
 			   uint32_t ProbeReqIELen, struct pe_session *pe_session);
@@ -61,7 +61,7 @@ lim_send_sme_probe_req_ind(tpAniSirGlobal mac,
  * @return None
  */
 
-void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, struct qdf_mac_addr addr,
+void lim_get_wpspbc_sessions(struct mac_context *mac_ctx, struct qdf_mac_addr addr,
 		uint8_t *uuid_e, eWPSPBCOverlap *overlap,
 		struct pe_session *session)
 {
@@ -111,7 +111,7 @@ void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, struct qdf_mac_addr addr,
  *
  * Return - None
  */
-static void lim_remove_timeout_pbc_sessions(tpAniSirGlobal mac,
+static void lim_remove_timeout_pbc_sessions(struct mac_context *mac,
 					    tSirWPSPBCSession *pbc)
 {
 	tSirWPSPBCSession *prev;
@@ -137,7 +137,7 @@ static void lim_remove_timeout_pbc_sessions(tpAniSirGlobal mac,
  *
  * Return: none
  */
-void lim_remove_pbc_sessions(tpAniSirGlobal mac, struct qdf_mac_addr remove_mac,
+void lim_remove_pbc_sessions(struct mac_context *mac, struct qdf_mac_addr remove_mac,
 			     struct pe_session *session_entry)
 {
 	tSirWPSPBCSession *pbc, *prev = NULL;
@@ -181,7 +181,7 @@ void lim_remove_pbc_sessions(tpAniSirGlobal mac, struct qdf_mac_addr remove_mac,
  * @return None
  */
 
-static void lim_update_pbc_session_entry(tpAniSirGlobal mac,
+static void lim_update_pbc_session_entry(struct mac_context *mac,
 					 uint8_t *addr, uint8_t *uuid_e,
 					 struct pe_session *pe_session)
 {
@@ -268,7 +268,7 @@ static void lim_update_pbc_session_entry(tpAniSirGlobal mac,
  * @return None
  */
 
-void lim_wpspbc_close(tpAniSirGlobal mac, struct pe_session *pe_session)
+void lim_wpspbc_close(struct mac_context *mac, struct pe_session *pe_session)
 {
 
 	lim_remove_timeout_pbc_sessions(mac, pe_session->pAPWPSPBCSession);
@@ -327,7 +327,7 @@ static bool lim_check11b_rates(uint8_t rate)
  */
 
 void
-lim_process_probe_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
+lim_process_probe_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 		struct pe_session *session)
 {
 	uint8_t *body_ptr;
@@ -532,7 +532,7 @@ multipleSSIDcheck:
  */
 
 static void
-lim_indicate_probe_req_to_hdd(tpAniSirGlobal mac, uint8_t *pBd,
+lim_indicate_probe_req_to_hdd(struct mac_context *mac, uint8_t *pBd,
 			      struct pe_session *pe_session)
 {
 	tpSirMacMgmtHdr pHdr;
@@ -568,7 +568,7 @@ lim_indicate_probe_req_to_hdd(tpAniSirGlobal mac, uint8_t *pBd,
  * @return None
  */
 void
-lim_process_probe_req_frame_multiple_bss(tpAniSirGlobal mac_ctx,
+lim_process_probe_req_frame_multiple_bss(struct mac_context *mac_ctx,
 			uint8_t *buf_descr, struct pe_session *session)
 {
 	uint8_t i;
@@ -623,7 +623,7 @@ lim_process_probe_req_frame_multiple_bss(tpAniSirGlobal mac_ctx,
  * @return None
  */
 void
-lim_send_sme_probe_req_ind(tpAniSirGlobal mac,
+lim_send_sme_probe_req_ind(struct mac_context *mac,
 			   tSirMacAddr peerMacAddr,
 			   uint8_t *pProbeReqIE,
 			   uint32_t ProbeReqIELen, struct pe_session *pe_session)

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

@@ -52,7 +52,7 @@
  * Return: 0 on success, one on failure
  */
 static QDF_STATUS
-lim_validate_ie_information_in_probe_rsp_frame(tpAniSirGlobal mac_ctx,
+lim_validate_ie_information_in_probe_rsp_frame(struct mac_context *mac_ctx,
 				uint8_t *pRxPacketInfo)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
@@ -98,7 +98,7 @@ lim_validate_ie_information_in_probe_rsp_frame(tpAniSirGlobal mac_ctx,
  * Return: None
  */
 void
-lim_process_probe_rsp_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_Packet_info,
+lim_process_probe_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_Packet_info,
 			    struct pe_session *session_entry)
 {
 	uint8_t *body;

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

@@ -85,7 +85,7 @@
 #define MIN_VENDOR_SPECIFIC_IE_SIZE     5
 #endif
 
-static QDF_STATUS lim_tdls_setup_add_sta(tpAniSirGlobal mac,
+static QDF_STATUS lim_tdls_setup_add_sta(struct mac_context *mac,
 		tSirTdlsAddStaReq * pAddStaReq, struct pe_session *pe_session);
 
 /*
@@ -198,7 +198,7 @@ static const uint8_t *lim_trace_tdls_action_string(uint8_t tdlsActionCode)
 /*
  * initialize TDLS setup list and related data structures.
  */
-void lim_init_tdls_data(tpAniSirGlobal mac, struct pe_session *pe_session)
+void lim_init_tdls_data(struct mac_context *mac, struct pe_session *pe_session)
 {
 	lim_init_peer_idxpool(mac, pe_session);
 
@@ -206,7 +206,7 @@ void lim_init_tdls_data(tpAniSirGlobal mac, struct pe_session *pe_session)
 }
 
 static void populate_dot11f_tdls_offchannel_params(
-				tpAniSirGlobal mac,
+				struct mac_context *mac,
 				struct pe_session *pe_session,
 				tDot11fIESuppChannels *suppChannels,
 				tDot11fIESuppOperatingClasses *suppOperClasses)
@@ -318,7 +318,7 @@ static void populate_dot11f_tdls_offchannel_params(
  *
  */
 
-static void populate_dot11f_link_iden(tpAniSirGlobal mac,
+static void populate_dot11f_link_iden(struct mac_context *mac,
 				      struct pe_session *pe_session,
 				      tDot11fIELinkIdentifier *linkIden,
 				      struct qdf_mac_addr peer_mac,
@@ -345,7 +345,7 @@ static void populate_dot11f_link_iden(tpAniSirGlobal mac,
 
 }
 
-static void populate_dot11f_tdls_ext_capability(tpAniSirGlobal mac,
+static void populate_dot11f_tdls_ext_capability(struct mac_context *mac,
 						struct pe_session *pe_session,
 						tDot11fIEExtCap *extCapability)
 {
@@ -382,7 +382,7 @@ static void populate_dot11f_tdls_ext_capability(tpAniSirGlobal mac,
  * |802.11 header|RFC1042 header|TDLS_PYLOAD_TYPE|PAYLOAD
  * |             |              |                |
  */
-static uint32_t lim_prepare_tdls_frame_header(tpAniSirGlobal mac, uint8_t *pFrame,
+static uint32_t lim_prepare_tdls_frame_header(struct mac_context *mac, uint8_t *pFrame,
 					      tDot11fIELinkIdentifier *link_iden,
 					      uint8_t tdlsLinkType, uint8_t reqType,
 					      uint8_t tid,
@@ -488,7 +488,7 @@ static QDF_STATUS lim_mgmt_tdls_tx_complete(void *context,
 					    uint32_t tx_complete,
 					    void *params)
 {
-	tpAniSirGlobal mac_ctx = (tpAniSirGlobal)context;
+	struct mac_context *mac_ctx = (struct mac_context *)context;
 
 	pe_debug("tdls_frm_session_id: %x tx_complete: %x",
 		mac_ctx->lim.tdls_frm_session_id, tx_complete);
@@ -510,7 +510,7 @@ static QDF_STATUS lim_mgmt_tdls_tx_complete(void *context,
  * This function can be used for bacst or unicast discovery request
  * We are not differentiating it here, it will all depnds on peer MAC address,
  */
-static QDF_STATUS lim_send_tdls_dis_req_frame(tpAniSirGlobal mac,
+static QDF_STATUS lim_send_tdls_dis_req_frame(struct mac_context *mac,
 						 struct qdf_mac_addr peer_mac,
 						 uint8_t dialog,
 						 struct pe_session *pe_session,
@@ -691,7 +691,7 @@ static QDF_STATUS lim_send_tdls_dis_req_frame(tpAniSirGlobal mac,
  * frames we are sending. Currently it is being used by lim_send_tdls_dis_rsp_frame,
  * lim_send_tdls_link_setup_req_frame and lim_send_tdls_setup_rsp_frame
  */
-static void populate_dot11f_tdls_ht_vht_cap(tpAniSirGlobal mac,
+static void populate_dot11f_tdls_ht_vht_cap(struct mac_context *mac,
 					    uint32_t selfDot11Mode,
 					    tDot11fIEHTCaps *htCap,
 					    tDot11fIEVHTCaps *vhtCap,
@@ -792,7 +792,7 @@ static void populate_dot11f_tdls_ht_vht_cap(tpAniSirGlobal mac,
  * Send TDLS discovery response frame on direct link.
  */
 
-static QDF_STATUS lim_send_tdls_dis_rsp_frame(tpAniSirGlobal mac,
+static QDF_STATUS lim_send_tdls_dis_rsp_frame(struct mac_context *mac,
 						 struct qdf_mac_addr peer_mac,
 						 uint8_t dialog,
 						 struct pe_session *pe_session,
@@ -999,7 +999,7 @@ static QDF_STATUS lim_send_tdls_dis_rsp_frame(tpAniSirGlobal mac,
  * This static function is currently used by lim_send_tdls_link_setup_req_frame and
  * lim_send_tdls_setup_rsp_frame to populate the AID if device is 11ac capable.
  */
-static void populate_dotf_tdls_vht_aid(tpAniSirGlobal mac, uint32_t selfDot11Mode,
+static void populate_dotf_tdls_vht_aid(struct mac_context *mac, uint32_t selfDot11Mode,
 				       struct qdf_mac_addr peerMac,
 				       tDot11fIEAID *Aid,
 				       struct pe_session *pe_session)
@@ -1051,7 +1051,7 @@ static void populate_dotf_tdls_vht_aid(tpAniSirGlobal mac, uint32_t selfDot11Mod
  * Return: None
  */
 static inline QDF_STATUS
-wma_tx_frame_with_tx_complete_send(tpAniSirGlobal mac, void *pPacket,
+wma_tx_frame_with_tx_complete_send(struct mac_context *mac, void *pPacket,
 				uint16_t nBytes,
 				uint8_t tid,
 				uint8_t *pFrame,
@@ -1072,7 +1072,7 @@ wma_tx_frame_with_tx_complete_send(tpAniSirGlobal mac, void *pPacket,
 #else
 
 static inline QDF_STATUS
-wma_tx_frame_with_tx_complete_send(tpAniSirGlobal mac, void *pPacket,
+wma_tx_frame_with_tx_complete_send(struct mac_context *mac, void *pPacket,
 				uint16_t nBytes,
 				uint8_t tid,
 				uint8_t *pFrame,
@@ -1105,7 +1105,7 @@ void lim_set_tdls_flags(roam_offload_synch_ind *roam_sync_ind_ptr,
  * TDLS setup Request frame on AP link
  */
 static
-QDF_STATUS lim_send_tdls_link_setup_req_frame(tpAniSirGlobal mac,
+QDF_STATUS lim_send_tdls_link_setup_req_frame(struct mac_context *mac,
 						 struct qdf_mac_addr peer_mac,
 						 uint8_t dialog,
 						 struct pe_session *pe_session,
@@ -1362,7 +1362,7 @@ QDF_STATUS lim_send_tdls_link_setup_req_frame(tpAniSirGlobal mac,
  * Send TDLS Teardown frame on Direct link or AP link, depends on reason code.
  */
 static
-QDF_STATUS lim_send_tdls_teardown_frame(tpAniSirGlobal mac,
+QDF_STATUS lim_send_tdls_teardown_frame(struct mac_context *mac,
 					   struct qdf_mac_addr peer_mac,
 					   uint16_t reason,
 					   uint8_t responder,
@@ -1556,7 +1556,7 @@ QDF_STATUS lim_send_tdls_teardown_frame(tpAniSirGlobal mac,
 /*
  * Send Setup RSP frame on AP link.
  */
-static QDF_STATUS lim_send_tdls_setup_rsp_frame(tpAniSirGlobal mac,
+static QDF_STATUS lim_send_tdls_setup_rsp_frame(struct mac_context *mac,
 						   struct qdf_mac_addr peer_mac,
 						   uint8_t dialog,
 						   struct pe_session *pe_session,
@@ -1812,7 +1812,7 @@ static QDF_STATUS lim_send_tdls_setup_rsp_frame(tpAniSirGlobal mac,
  * Send TDLS setup CNF frame on AP link
  */
 static
-QDF_STATUS lim_send_tdls_link_setup_cnf_frame(tpAniSirGlobal mac,
+QDF_STATUS lim_send_tdls_link_setup_cnf_frame(struct mac_context *mac,
 						 struct qdf_mac_addr peer_mac,
 						 uint8_t dialog,
 						 uint32_t peerCapability,
@@ -2019,7 +2019,7 @@ QDF_STATUS lim_send_tdls_link_setup_cnf_frame(tpAniSirGlobal mac,
 /* This Function is similar to populate_dot11f_ht_caps, except that the HT Capabilities
  * are considered from the AddStaReq rather from the cfg.dat as in populate_dot11f_ht_caps
  */
-static QDF_STATUS lim_tdls_populate_dot11f_ht_caps(tpAniSirGlobal mac,
+static QDF_STATUS lim_tdls_populate_dot11f_ht_caps(struct mac_context *mac,
 						      struct pe_session *pe_session,
 						      tSirTdlsAddStaReq *
 						      pTdlsAddStaReq,
@@ -2155,7 +2155,7 @@ static QDF_STATUS lim_tdls_populate_dot11f_ht_caps(tpAniSirGlobal mac,
 }
 
 static QDF_STATUS
-lim_tdls_populate_dot11f_vht_caps(tpAniSirGlobal mac,
+lim_tdls_populate_dot11f_vht_caps(struct mac_context *mac,
 				  tSirTdlsAddStaReq *pTdlsAddStaReq,
 				  tDot11fIEVHTCaps *pDot11f)
 {
@@ -2241,7 +2241,7 @@ lim_tdls_populate_dot11f_vht_caps(tpAniSirGlobal mac,
  * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure.
  */
 static QDF_STATUS
-lim_tdls_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode stads,
+lim_tdls_populate_matching_rate_set(struct mac_context *mac_ctx, tpDphHashNode stads,
 				    uint8_t *supp_rate_set,
 				    uint8_t supp_rates_len,
 				    uint8_t *supp_mcs_set,
@@ -2422,7 +2422,7 @@ lim_tdls_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode stads,
 /*
  * update HASH node entry info
  */
-static void lim_tdls_update_hash_node_info(tpAniSirGlobal mac,
+static void lim_tdls_update_hash_node_info(struct mac_context *mac,
 					   tDphHashNode *pStaDs,
 					   tSirTdlsAddStaReq *pTdlsAddStaReq,
 					   struct pe_session *pe_session)
@@ -2564,7 +2564,7 @@ static void lim_tdls_update_hash_node_info(tpAniSirGlobal mac,
 /*
  * Add STA for TDLS setup procedure
  */
-static QDF_STATUS lim_tdls_setup_add_sta(tpAniSirGlobal mac,
+static QDF_STATUS lim_tdls_setup_add_sta(struct mac_context *mac,
 					    tSirTdlsAddStaReq *pAddStaReq,
 					    struct pe_session *pe_session)
 {
@@ -2641,7 +2641,7 @@ static QDF_STATUS lim_tdls_setup_add_sta(tpAniSirGlobal mac,
 /*
  * Del STA, after Link is teardown or discovery response sent on direct link
  */
-static QDF_STATUS lim_tdls_del_sta(tpAniSirGlobal mac,
+static QDF_STATUS lim_tdls_del_sta(struct mac_context *mac,
 				      struct qdf_mac_addr peerMac,
 				      struct pe_session *pe_session,
 				      bool resp_reqd)
@@ -2674,7 +2674,7 @@ static QDF_STATUS lim_tdls_del_sta(tpAniSirGlobal mac,
 /*
  * Once Link is setup with PEER, send Add STA ind to SME
  */
-static QDF_STATUS lim_send_sme_tdls_add_sta_rsp(tpAniSirGlobal mac,
+static QDF_STATUS lim_send_sme_tdls_add_sta_rsp(struct mac_context *mac,
 						uint8_t sessionId,
 						tSirMacAddr peerMac,
 						uint8_t updateSta,
@@ -2717,7 +2717,7 @@ static QDF_STATUS lim_send_sme_tdls_add_sta_rsp(tpAniSirGlobal mac,
 /*
  * STA RSP received from HAL
  */
-QDF_STATUS lim_process_tdls_add_sta_rsp(tpAniSirGlobal mac, void *msg,
+QDF_STATUS lim_process_tdls_add_sta_rsp(struct mac_context *mac, void *msg,
 					struct pe_session *pe_session)
 {
 	tAddStaParams *pAddStaParams = (tAddStaParams *) msg;
@@ -2774,7 +2774,7 @@ add_sta_error:
  */
 
 static void
-lim_send_tdls_comp_mgmt_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type,
+lim_send_tdls_comp_mgmt_rsp(struct mac_context *mac_ctx, uint16_t msg_type,
 	 tSirResultCodes result_code, uint8_t sme_session_id,
 	 uint16_t sme_transaction_id)
 {
@@ -2815,7 +2815,7 @@ lim_send_tdls_comp_mgmt_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type,
  *
  * Return: QDF_STATUS_SUCCESS on success, error code otherwise
  */
-QDF_STATUS lim_process_sme_tdls_mgmt_send_req(tpAniSirGlobal mac_ctx,
+QDF_STATUS lim_process_sme_tdls_mgmt_send_req(struct mac_context *mac_ctx,
 						 uint32_t *msg)
 {
 	/* get all discovery request parameters */
@@ -2940,7 +2940,7 @@ lim_tdls_send_mgmt_error:
 /*
  * Once link is teardown, send Del Peer Ind to SME
  */
-static QDF_STATUS lim_send_sme_tdls_del_sta_rsp(tpAniSirGlobal mac,
+static QDF_STATUS lim_send_sme_tdls_del_sta_rsp(struct mac_context *mac,
 						uint8_t sessionId,
 						struct qdf_mac_addr peerMac,
 						tDphHashNode *pStaDs, uint8_t status)
@@ -2976,7 +2976,7 @@ static QDF_STATUS lim_send_sme_tdls_del_sta_rsp(tpAniSirGlobal mac,
 /*
  * Process Send Mgmt Request from SME and transmit to AP.
  */
-QDF_STATUS lim_process_sme_tdls_add_sta_req(tpAniSirGlobal mac,
+QDF_STATUS lim_process_sme_tdls_add_sta_req(struct mac_context *mac,
 					       uint32_t *pMsgBuf)
 {
 	/* get all discovery request parameters */
@@ -3038,7 +3038,7 @@ lim_tdls_add_sta_error:
 /*
  * Process Del Sta Request from SME .
  */
-QDF_STATUS lim_process_sme_tdls_del_sta_req(tpAniSirGlobal mac,
+QDF_STATUS lim_process_sme_tdls_del_sta_req(struct mac_context *mac,
 					       uint32_t *pMsgBuf)
 {
 	/* get all discovery request parameters */
@@ -3109,7 +3109,7 @@ lim_tdls_del_sta_error:
  *
  * Return: None
  */
-static void lim_check_aid_and_delete_peer(tpAniSirGlobal p_mac,
+static void lim_check_aid_and_delete_peer(struct mac_context *p_mac,
 					  struct pe_session *session_entry)
 {
 	tpDphHashNode stads = NULL;
@@ -3176,7 +3176,7 @@ skip:
  *
  * Return: QDF_STATUS_SUCCESS on success, error code otherwise
  */
-QDF_STATUS lim_delete_tdls_peers(tpAniSirGlobal mac_ctx,
+QDF_STATUS lim_delete_tdls_peers(struct mac_context *mac_ctx,
 				    struct pe_session *session_entry)
 {
 	pe_debug("Enter");
@@ -3210,7 +3210,7 @@ QDF_STATUS lim_delete_tdls_peers(tpAniSirGlobal mac_ctx,
  *
  * Return: Success: QDF_STATUS_SUCCESS Failure: Error value
  */
-QDF_STATUS lim_process_sme_del_all_tdls_peers(tpAniSirGlobal p_mac,
+QDF_STATUS lim_process_sme_del_all_tdls_peers(struct mac_context *p_mac,
 						 uint32_t *msg_buf)
 {
 	struct sir_del_all_tdls_peers *msg;
@@ -3246,7 +3246,7 @@ QDF_STATUS lim_process_sme_del_all_tdls_peers(tpAniSirGlobal p_mac,
  *
  * Return: None
  */
-void lim_process_tdls_del_sta_rsp(tpAniSirGlobal mac_ctx,
+void lim_process_tdls_del_sta_rsp(struct mac_context *mac_ctx,
 				  struct scheduler_msg *lim_msg,
 				  struct pe_session *session_entry)
 {

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

@@ -77,7 +77,7 @@ static void get_local_power_constraint_probe_response(
  *
  * Return: None
  */
-static void get_ese_version_ie_probe_response(tpAniSirGlobal mac_ctx,
+static void get_ese_version_ie_probe_response(struct mac_context *mac_ctx,
 					tpSirProbeRespBeacon beacon_struct,
 					struct pe_session *session)
 {
@@ -94,7 +94,7 @@ static void get_local_power_constraint_probe_response(
 
 }
 
-static inline void get_ese_version_ie_probe_response(tpAniSirGlobal mac_ctx,
+static inline void get_ese_version_ie_probe_response(struct mac_context *mac_ctx,
 					tpSirProbeRespBeacon beacon_struct,
 					struct pe_session *session)
 {
@@ -195,7 +195,7 @@ static void lim_objmgr_update_vdev_nss(struct wlan_objmgr_psoc *psoc,
  * Return: None
  */
 void
-lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie,
+lim_extract_ap_capability(struct mac_context *mac_ctx, uint8_t *p_ie,
 	uint16_t ie_len, uint8_t *qos_cap, uint16_t *prop_cap, uint8_t *uapsd,
 	int8_t *local_constraint, struct pe_session *session)
 {

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

@@ -32,19 +32,19 @@
 #define __LIM_PROP_EXTS_UTILS_H
 
 /* Function templates */
-void limQuietBss(tpAniSirGlobal, uint32_t);
-void lim_cleanupMeasData(tpAniSirGlobal);
-void limDeleteMeasTimers(tpAniSirGlobal);
-void limStopMeasTimers(tpAniSirGlobal mac);
-void lim_cleanupMeasResources(tpAniSirGlobal);
-void limRestorePreLearnState(tpAniSirGlobal);
-void limCollectMeasurementData(tpAniSirGlobal, uint32_t *, tpSchBeaconStruct);
-void limCollectRSSI(tpAniSirGlobal);
-void limDeleteCurrentBssWdsNode(tpAniSirGlobal);
-uint32_t limComputeAvg(tpAniSirGlobal, uint32_t, uint32_t);
+void limQuietBss(struct mac_context *, uint32_t);
+void lim_cleanupMeasData(struct mac_context *);
+void limDeleteMeasTimers(struct mac_context *);
+void limStopMeasTimers(struct mac_context *mac);
+void lim_cleanupMeasResources(struct mac_context *);
+void limRestorePreLearnState(struct mac_context *);
+void limCollectMeasurementData(struct mac_context *, uint32_t *, tpSchBeaconStruct);
+void limCollectRSSI(struct mac_context *);
+void limDeleteCurrentBssWdsNode(struct mac_context *);
+uint32_t limComputeAvg(struct mac_context *, uint32_t, uint32_t);
 
 /* / Function to extract AP's HCF capability from IE fields */
-void lim_extract_ap_capability(tpAniSirGlobal, uint8_t *, uint16_t, uint8_t *,
+void lim_extract_ap_capability(struct mac_context *, uint8_t *, uint16_t, uint8_t *,
 			       uint16_t *, uint8_t *, int8_t *, struct pe_session *);
 
 ePhyChanBondState lim_get_htcb_state(ePhyChanBondState aniCBMode);

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

@@ -58,7 +58,7 @@
  * Return: None
  */
 
-void lim_update_re_assoc_globals(tpAniSirGlobal mac, tpSirAssocRsp pAssocRsp,
+void lim_update_re_assoc_globals(struct mac_context *mac, tpSirAssocRsp pAssocRsp,
 				 struct pe_session *pe_session)
 {
 	/* Update the current Bss Information */
@@ -108,7 +108,7 @@ void lim_update_re_assoc_globals(tpAniSirGlobal mac, tpSirAssocRsp pAssocRsp,
  *
  * Return: None
  */
-void lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal mac,
+void lim_handle_del_bss_in_re_assoc_context(struct mac_context *mac,
 		tpDphHashNode pStaDs, struct pe_session *pe_session)
 {
 	tLimMlmReassocCnf mlmReassocCnf;
@@ -241,7 +241,7 @@ error:
  *
  * Return: None
  */
-void lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal mac,
+void lim_handle_add_bss_in_re_assoc_context(struct mac_context *mac,
 		tpDphHashNode pStaDs, struct pe_session *pe_session)
 {
 	tLimMlmReassocCnf mlmReassocCnf;
@@ -357,7 +357,7 @@ Error:
  * Return: true  When STA is waiting for Reassoc response from AP
  *         else false
  */
-bool lim_is_reassoc_in_progress(tpAniSirGlobal mac, struct pe_session *pe_session)
+bool lim_is_reassoc_in_progress(struct mac_context *mac, struct pe_session *pe_session)
 {
 	if (pe_session == NULL)
 		return false;
@@ -385,7 +385,7 @@ bool lim_is_reassoc_in_progress(tpAniSirGlobal mac, struct pe_session *pe_sessio
  *
  * Return: QDF_STATUS_SUCCESS on success else QDF_STATUS failure codes
  */
-QDF_STATUS lim_add_ft_sta_self(tpAniSirGlobal mac_ctx, uint16_t assoc_id,
+QDF_STATUS lim_add_ft_sta_self(struct mac_context *mac_ctx, uint16_t assoc_id,
 				struct pe_session *session_entry)
 {
 	tpAddStaParams add_sta_params = NULL;
@@ -438,7 +438,7 @@ QDF_STATUS lim_add_ft_sta_self(tpAniSirGlobal mac_ctx, uint16_t assoc_id,
  */
 
 void
-lim_restore_pre_reassoc_state(tpAniSirGlobal mac,
+lim_restore_pre_reassoc_state(struct mac_context *mac,
 		tSirResultCodes resultCode, uint16_t protStatusCode,
 		struct pe_session *pe_session)
 {
@@ -481,7 +481,7 @@ lim_restore_pre_reassoc_state(tpAniSirGlobal mac,
  *
  * Return: None
  */
-void lim_post_reassoc_failure(tpAniSirGlobal mac,
+void lim_post_reassoc_failure(struct mac_context *mac,
 		tSirResultCodes resultCode, uint16_t protStatusCode,
 		struct pe_session *pe_session)
 {

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

@@ -35,7 +35,7 @@
  *
  * Return: TX_SUCCESS or TX_TIMER_ERROR
  */
-uint32_t lim_create_timers_host_roam(tpAniSirGlobal mac_ctx)
+uint32_t lim_create_timers_host_roam(struct mac_context *mac_ctx)
 {
 	uint32_t cfg_value;
 
@@ -66,7 +66,7 @@ err_roam_timer:
 	return TX_TIMER_ERROR;
 }
 
-void lim_delete_timers_host_roam(tpAniSirGlobal mac_ctx)
+void lim_delete_timers_host_roam(struct mac_context *mac_ctx)
 {
 	tLimTimers *lim_timer = &mac_ctx->lim.limTimers;
 
@@ -76,7 +76,7 @@ void lim_delete_timers_host_roam(tpAniSirGlobal mac_ctx)
 	tx_timer_delete(&lim_timer->gLimFTPreAuthRspTimer);
 }
 
-void lim_deactivate_timers_host_roam(tpAniSirGlobal mac_ctx)
+void lim_deactivate_timers_host_roam(struct mac_context *mac_ctx)
 {
 	tLimTimers *lim_timer = &mac_ctx->lim.limTimers;
 
@@ -96,7 +96,7 @@ void lim_deactivate_timers_host_roam(tpAniSirGlobal mac_ctx)
  *
  * Return: None
  */
-void lim_deactivate_and_change_timer_host_roam(tpAniSirGlobal mac_ctx,
+void lim_deactivate_and_change_timer_host_roam(struct mac_context *mac_ctx,
 		uint32_t timer_id)
 {
 	uint32_t val = 0;

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

@@ -61,7 +61,7 @@
  * @return None
  */
 void
-lim_collect_bss_description(tpAniSirGlobal mac,
+lim_collect_bss_description(struct mac_context *mac,
 			    tSirBssDescription *pBssDescr,
 			    tpSirProbeRespBeacon pBPR,
 			    uint8_t *pRxPacketInfo, uint8_t fScanning)

core/mac/src/pe/lim/lim_scan_result_utils.h

@@ -33,9 +33,9 @@
 
 /* Scan result hash related functions */
 uint8_t lim_scan_hash_function(tSirMacAddr);
-void lim_restore_pre_scan_state(tpAniSirGlobal);
-void lim_copy_scan_result(tpAniSirGlobal, uint8_t *);
-void lim_collect_bss_description(tpAniSirGlobal mac,
+void lim_restore_pre_scan_state(struct mac_context *);
+void lim_copy_scan_result(struct mac_context *, uint8_t *);
+void lim_collect_bss_description(struct mac_context *mac,
 			    tSirBssDescription *pBssDescr,
 			    tpSirProbeRespBeacon pBPR,
 			    uint8_t *pRxPacketInfo, uint8_t fScanning);

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

@@ -71,7 +71,7 @@
  * @return true if passed authType is enabled else false
  */
 uint8_t
-lim_is_auth_algo_supported(tpAniSirGlobal mac, tAniAuthType authType,
+lim_is_auth_algo_supported(struct mac_context *mac, tAniAuthType authType,
 			   struct pe_session *pe_session)
 {
 	bool algoEnable, privacyOptImp;
@@ -131,7 +131,7 @@ lim_is_auth_algo_supported(tpAniSirGlobal mac, tAniAuthType authType,
  * @return None
  */
 
-void lim_init_pre_auth_list(tpAniSirGlobal mac)
+void lim_init_pre_auth_list(struct mac_context *mac)
 {
 	mac->lim.pLimPreAuthList = NULL;
 
@@ -154,7 +154,7 @@ void lim_init_pre_auth_list(tpAniSirGlobal mac)
  * @return None
  */
 
-void lim_delete_pre_auth_list(tpAniSirGlobal mac)
+void lim_delete_pre_auth_list(struct mac_context *mac)
 {
 	struct tLimPreAuthNode *pCurrNode, *pTempNode;
 
@@ -189,7 +189,7 @@ void lim_delete_pre_auth_list(tpAniSirGlobal mac)
  * @return Pointer to pre-auth node if found, else NULL
  */
 
-struct tLimPreAuthNode *lim_search_pre_auth_list(tpAniSirGlobal mac,
+struct tLimPreAuthNode *lim_search_pre_auth_list(struct mac_context *mac,
 						 tSirMacAddr macAddr)
 {
 	struct tLimPreAuthNode *pTempNode = mac->lim.pLimPreAuthList;
@@ -217,7 +217,7 @@ struct tLimPreAuthNode *lim_search_pre_auth_list(tpAniSirGlobal mac,
  * Return: return true if any preauthnode deleted else false
  */
 uint8_t
-lim_delete_open_auth_pre_auth_node(tpAniSirGlobal mac_ctx)
+lim_delete_open_auth_pre_auth_node(struct mac_context *mac_ctx)
 {
 	struct tLimPreAuthNode    *prev_node, *temp_node, *found_node;
 	uint8_t auth_node_freed = false;
@@ -276,7 +276,7 @@ lim_delete_open_auth_pre_auth_node(tpAniSirGlobal mac_ctx)
  * @return None
  */
 
-void lim_add_pre_auth_node(tpAniSirGlobal mac, struct tLimPreAuthNode *pAuthNode)
+void lim_add_pre_auth_node(struct mac_context *mac, struct tLimPreAuthNode *pAuthNode)
 {
 	mac->lim.gLimNumPreAuthContexts++;
 
@@ -303,7 +303,7 @@ void lim_add_pre_auth_node(tpAniSirGlobal mac, struct tLimPreAuthNode *pAuthNode
  * @return None
  */
 
-void lim_release_pre_auth_node(tpAniSirGlobal mac, tpLimPreAuthNode pAuthNode)
+void lim_release_pre_auth_node(struct mac_context *mac, tpLimPreAuthNode pAuthNode)
 {
 	pAuthNode->fFree = 1;
 	MTRACE(mac_trace
@@ -336,7 +336,7 @@ void lim_release_pre_auth_node(tpAniSirGlobal mac, tpLimPreAuthNode pAuthNode)
  * @return None
  */
 
-void lim_delete_pre_auth_node(tpAniSirGlobal mac, tSirMacAddr macAddr)
+void lim_delete_pre_auth_node(struct mac_context *mac, tSirMacAddr macAddr)
 {
 	struct tLimPreAuthNode *pPrevNode, *pTempNode;
 
@@ -411,7 +411,7 @@ void lim_delete_pre_auth_node(tpAniSirGlobal mac, tSirMacAddr macAddr)
  */
 
 void
-lim_restore_from_auth_state(tpAniSirGlobal mac, tSirResultCodes resultCode,
+lim_restore_from_auth_state(struct mac_context *mac, tSirResultCodes resultCode,
 			    uint16_t protStatusCode, struct pe_session *pe_session)
 {
 	tSirMacAddr currentBssId;
@@ -495,7 +495,7 @@ lim_restore_from_auth_state(tpAniSirGlobal mac, tSirResultCodes resultCode,
  */
 
 void
-lim_encrypt_auth_frame(tpAniSirGlobal mac, uint8_t keyId, uint8_t *pKey,
+lim_encrypt_auth_frame(struct mac_context *mac, uint8_t keyId, uint8_t *pKey,
 		       uint8_t *pPlainText, uint8_t *pEncrBody,
 		       uint32_t keyLength)
 {
@@ -684,7 +684,7 @@ lim_rc4(uint8_t *pDest, uint8_t *pSrc, uint8_t *seed, uint32_t keyLength,
  */
 
 uint8_t
-lim_decrypt_auth_frame(tpAniSirGlobal mac, uint8_t *pKey, uint8_t *pEncrBody,
+lim_decrypt_auth_frame(struct mac_context *mac, uint8_t *pKey, uint8_t *pEncrBody,
 		       uint8_t *pPlainBody, uint32_t keyLength, uint16_t frameLen)
 {
 	uint8_t seed[LIM_SEED_LENGTH], icv[SIR_MAC_WEP_ICV_LENGTH];
@@ -726,7 +726,7 @@ lim_decrypt_auth_frame(tpAniSirGlobal mac, uint8_t *pKey, uint8_t *pEncrBody,
  *
  * A utility API to send MLM_SETKEYS_CNF to SME
  */
-void lim_post_sme_set_keys_cnf(tpAniSirGlobal mac,
+void lim_post_sme_set_keys_cnf(struct mac_context *mac,
 			       tLimMlmSetKeysReq *pMlmSetKeysReq,
 			       tLimMlmSetKeysCnf *mlmSetKeysCnf)
 {
@@ -762,7 +762,7 @@ void lim_post_sme_set_keys_cnf(tpAniSirGlobal mac,
  * @param pMlmSetKeysReq Pointer to MLM_SETKEYS_REQ buffer
  * @return none
  */
-void lim_send_set_bss_key_req(tpAniSirGlobal mac,
+void lim_send_set_bss_key_req(struct mac_context *mac,
 			      tLimMlmSetKeysReq *pMlmSetKeysReq,
 			      struct pe_session *pe_session)
 {
@@ -862,7 +862,7 @@ end:
  * @param defWEPIdx      The default WEP key index [0..3]
  * @return none
  */
-void lim_send_set_sta_key_req(tpAniSirGlobal mac,
+void lim_send_set_sta_key_req(struct mac_context *mac,
 			      tLimMlmSetKeysReq *pMlmSetKeysReq,
 			      uint16_t staIdx,
 			      uint8_t defWEPIdx,

core/mac/src/pe/lim/lim_security_utils.h

@@ -49,31 +49,31 @@
 
 struct tLimPreAuthNode;
 
-uint8_t lim_is_auth_algo_supported(tpAniSirGlobal, tAniAuthType, struct pe_session *);
+uint8_t lim_is_auth_algo_supported(struct mac_context *, tAniAuthType, struct pe_session *);
 
 /* MAC based authentication related functions */
-void lim_init_pre_auth_list(tpAniSirGlobal);
-void lim_delete_pre_auth_list(tpAniSirGlobal);
-struct tLimPreAuthNode *lim_search_pre_auth_list(tpAniSirGlobal, tSirMacAddr);
-void lim_add_pre_auth_node(tpAniSirGlobal, struct tLimPreAuthNode *);
-void lim_delete_pre_auth_node(tpAniSirGlobal, tSirMacAddr);
-void lim_release_pre_auth_node(tpAniSirGlobal mac, tpLimPreAuthNode pAuthNode);
-void lim_restore_from_auth_state(tpAniSirGlobal,
+void lim_init_pre_auth_list(struct mac_context *);
+void lim_delete_pre_auth_list(struct mac_context *);
+struct tLimPreAuthNode *lim_search_pre_auth_list(struct mac_context *, tSirMacAddr);
+void lim_add_pre_auth_node(struct mac_context *, struct tLimPreAuthNode *);
+void lim_delete_pre_auth_node(struct mac_context *, tSirMacAddr);
+void lim_release_pre_auth_node(struct mac_context *mac, tpLimPreAuthNode pAuthNode);
+void lim_restore_from_auth_state(struct mac_context *,
 				 tSirResultCodes, uint16_t, struct pe_session *);
-uint8_t lim_delete_open_auth_pre_auth_node(tpAniSirGlobal mac_ctx);
+uint8_t lim_delete_open_auth_pre_auth_node(struct mac_context *mac_ctx);
 
 /* Encryption/Decryption related functions */
 void lim_compute_crc32(uint8_t *, uint8_t *, uint16_t);
 void lim_rc4(uint8_t *, uint8_t *, uint8_t *, uint32_t, uint16_t);
-void lim_encrypt_auth_frame(tpAniSirGlobal, uint8_t, uint8_t *, uint8_t *,
+void lim_encrypt_auth_frame(struct mac_context *, uint8_t, uint8_t *, uint8_t *,
 			    uint8_t *, uint32_t);
-uint8_t lim_decrypt_auth_frame(tpAniSirGlobal, uint8_t *, uint8_t *, uint8_t *,
+uint8_t lim_decrypt_auth_frame(struct mac_context *, uint8_t *, uint8_t *, uint8_t *,
 			       uint32_t, uint16_t);
 
-void lim_send_set_bss_key_req(tpAniSirGlobal, tLimMlmSetKeysReq *, struct pe_session *);
-void lim_send_set_sta_key_req(tpAniSirGlobal, tLimMlmSetKeysReq *, uint16_t, uint8_t,
+void lim_send_set_bss_key_req(struct mac_context *, tLimMlmSetKeysReq *, struct pe_session *);
+void lim_send_set_sta_key_req(struct mac_context *, tLimMlmSetKeysReq *, uint16_t, uint8_t,
 			      struct pe_session *, bool sendRsp);
-void lim_post_sme_set_keys_cnf(tpAniSirGlobal, tLimMlmSetKeysReq *,
+void lim_post_sme_set_keys_cnf(struct mac_context *, tLimMlmSetKeysReq *,
 			       tLimMlmSetKeysCnf *);
 
 #define  PTAPS  0xedb88320

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

@@ -64,7 +64,7 @@
  *
  * Return: None
  */
-void lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx,
+void lim_send_reassoc_req_with_ft_ies_mgmt_frame(struct mac_context *mac_ctx,
 	tLimMlmReassocReq *mlm_reassoc_req,
 	struct pe_session *pe_session)
 {
@@ -475,7 +475,7 @@ err:
  *
  * Return: None
  */
-void lim_send_retry_reassoc_req_frame(tpAniSirGlobal mac,
+void lim_send_retry_reassoc_req_frame(struct mac_context *mac,
 				      tLimMlmReassocReq *pMlmReassocReq,
 				      struct pe_session *pe_session)
 {
@@ -539,7 +539,7 @@ end:
  *
  * Return: None
  */
-void lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal mac,
+void lim_send_reassoc_req_mgmt_frame(struct mac_context *mac,
 				tLimMlmReassocReq *pMlmReassocReq,
 				struct pe_session *pe_session)
 {
@@ -808,7 +808,7 @@ void lim_process_rx_scan_handler(struct wlan_objmgr_vdev *vdev,
 				 struct scan_event *event,
 				 void *arg)
 {
-	tpAniSirGlobal mac_ctx;
+	struct mac_context *mac_ctx;
 	enum sir_scan_event_type event_type;
 
 	QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
@@ -816,7 +816,7 @@ void lim_process_rx_scan_handler(struct wlan_objmgr_vdev *vdev,
 		  event->type, event->scan_id, event->requester,
 		  event->chan_freq, event->reason);
 
-	mac_ctx = (tpAniSirGlobal)arg;
+	mac_ctx = (struct mac_context *)arg;
 	event_type = 0x1 << event->type;
 
 	qdf_mtrace(QDF_MODULE_ID_SCAN, QDF_MODULE_ID_PE, event->type,

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

@@ -75,7 +75,7 @@
  * number will roll over.
  *
  */
-static void lim_add_mgmt_seq_num(tpAniSirGlobal mac, tpSirMacMgmtHdr pMacHdr)
+static void lim_add_mgmt_seq_num(struct mac_context *mac, tpSirMacMgmtHdr pMacHdr)
 {
 	if (mac->mgmtSeqNum >= WLAN_HOST_SEQ_NUM_MAX) {
 		mac->mgmtSeqNum = WLAN_HOST_SEQ_NUM_MIN - 1;
@@ -105,7 +105,7 @@ static void lim_add_mgmt_seq_num(tpAniSirGlobal mac, tpSirMacMgmtHdr pMacHdr)
  * number will roll over.
  *
  */
-void lim_populate_p2p_mac_header(tpAniSirGlobal mac, uint8_t *pBD)
+void lim_populate_p2p_mac_header(struct mac_context *mac, uint8_t *pBD)
 {
 	tpSirMacMgmtHdr pMacHdr;
 
@@ -140,7 +140,7 @@ void lim_populate_p2p_mac_header(tpAniSirGlobal mac, uint8_t *pBD)
  * Return: None
  */
 
-void lim_populate_mac_header(tpAniSirGlobal mac_ctx, uint8_t *buf,
+void lim_populate_mac_header(struct mac_context *mac_ctx, uint8_t *buf,
 		uint8_t type, uint8_t sub_type, tSirMacAddr peer_addr,
 		tSirMacAddr self_mac_addr)
 {
@@ -197,7 +197,7 @@ void lim_populate_mac_header(tpAniSirGlobal mac_ctx, uint8_t *buf,
  * Return: QDF_STATUS (QDF_STATUS_SUCCESS on success and error codes otherwise)
  */
 QDF_STATUS
-lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx,
+lim_send_probe_req_mgmt_frame(struct mac_context *mac_ctx,
 			      tSirMacSSid *ssid,
 			      tSirMacAddr bssid,
 			      uint8_t channel,
@@ -461,7 +461,7 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx,
 	return QDF_STATUS_SUCCESS;
 } /* End lim_send_probe_req_mgmt_frame. */
 
-static QDF_STATUS lim_get_addn_ie_for_probe_resp(tpAniSirGlobal mac,
+static QDF_STATUS lim_get_addn_ie_for_probe_resp(struct mac_context *mac,
 					     uint8_t *addIE, uint16_t *addnIELen,
 					     uint8_t probeReqP2pIe)
 {
@@ -528,7 +528,7 @@ static QDF_STATUS lim_get_addn_ie_for_probe_resp(tpAniSirGlobal mac,
  */
 
 void
-lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
+lim_send_probe_rsp_mgmt_frame(struct mac_context *mac_ctx,
 			      tSirMacAddr peer_macaddr,
 			      tpAniSSID ssid,
 			      short n_staid,
@@ -868,7 +868,7 @@ err_ret:
 } /* End lim_send_probe_rsp_mgmt_frame. */
 
 void
-lim_send_addts_req_action_frame(tpAniSirGlobal mac,
+lim_send_addts_req_action_frame(struct mac_context *mac,
 				tSirMacAddr peerMacAddr,
 				tSirAddtsReqInfo *pAddTS, struct pe_session *pe_session)
 {
@@ -1085,7 +1085,7 @@ lim_send_addts_req_action_frame(tpAniSirGlobal mac,
  */
 
 void
-lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
+lim_send_assoc_rsp_mgmt_frame(struct mac_context *mac_ctx,
 	uint16_t status_code, uint16_t aid, tSirMacAddr peer_addr,
 	uint8_t subtype, tpDphHashNode sta, struct pe_session *pe_session)
 {
@@ -1425,7 +1425,7 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
 }
 
 void
-lim_send_delts_req_action_frame(tpAniSirGlobal mac,
+lim_send_delts_req_action_frame(struct mac_context *mac,
 				tSirMacAddr peer,
 				uint8_t wmmTspecPresent,
 				tSirMacTSInfo *pTsinfo,
@@ -1580,7 +1580,7 @@ static QDF_STATUS lim_assoc_tx_complete_cnf(void *context,
 {
 	uint16_t assoc_ack_status;
 	uint16_t reason_code;
-	tpAniSirGlobal mac_ctx = (tpAniSirGlobal)context;
+	struct mac_context *mac_ctx = (struct mac_context *)context;
 
 	pe_debug("tx_complete= %d", tx_complete);
 	if (tx_complete == WMI_MGMT_TX_COMP_TYPE_COMPLETE_OK) {
@@ -1610,7 +1610,7 @@ static QDF_STATUS lim_assoc_tx_complete_cnf(void *context,
  */
 
 void
-lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
+lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
 			      tLimMlmAssocReq *mlm_assoc_req,
 			      struct pe_session *pe_session)
 {
@@ -2139,7 +2139,7 @@ static QDF_STATUS lim_addba_rsp_tx_complete_cnf(void *context,
 						uint32_t tx_complete,
 						void *params)
 {
-	tpAniSirGlobal mac_ctx = (tpAniSirGlobal)context;
+	struct mac_context *mac_ctx = (struct mac_context *)context;
 	tSirMacMgmtHdr *mac_hdr;
 	tDot11faddba_rsp rsp;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
@@ -2211,7 +2211,7 @@ static QDF_STATUS lim_auth_tx_complete_cnf(void *context,
 					   uint32_t tx_complete,
 					   void *params)
 {
-	tpAniSirGlobal mac_ctx = (tpAniSirGlobal)context;
+	struct mac_context *mac_ctx = (struct mac_context *)context;
 	uint16_t auth_ack_status;
 	uint16_t reason_code;
 
@@ -2254,7 +2254,7 @@ static QDF_STATUS lim_auth_tx_complete_cnf(void *context,
  * Return: void
  */
 void
-lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx,
+lim_send_auth_mgmt_frame(struct mac_context *mac_ctx,
 			 tpSirMacAuthFrameBody auth_frame,
 			 tSirMacAddr peer_addr,
 			 uint8_t wep_challenge_len,
@@ -2568,7 +2568,7 @@ alloc_packet:
 	return;
 }
 
-QDF_STATUS lim_send_deauth_cnf(tpAniSirGlobal mac_ctx)
+QDF_STATUS lim_send_deauth_cnf(struct mac_context *mac_ctx)
 {
 	uint16_t aid;
 	tpDphHashNode sta_ds;
@@ -2667,7 +2667,7 @@ end:
  * Return: QDF_STATUS_SUCCESS
  */
 
-QDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx)
+QDF_STATUS lim_send_disassoc_cnf(struct mac_context *mac_ctx)
 {
 	uint16_t aid;
 	tpDphHashNode sta_ds;
@@ -2748,7 +2748,7 @@ QDF_STATUS lim_disassoc_tx_complete_cnf(void *context,
 					uint32_t tx_success,
 					void *params)
 {
-	tpAniSirGlobal max_ctx = (tpAniSirGlobal)context;
+	struct mac_context *max_ctx = (struct mac_context *)context;
 
 	pe_debug("tx_success: %d", tx_success);
 
@@ -2760,7 +2760,7 @@ static QDF_STATUS lim_disassoc_tx_complete_cnf_handler(void *context,
 						       uint32_t tx_success,
 						       void *params)
 {
-	tpAniSirGlobal max_ctx = (tpAniSirGlobal)context;
+	struct mac_context *max_ctx = (struct mac_context *)context;
 	QDF_STATUS status_code;
 	struct scheduler_msg msg = {0};
 
@@ -2783,7 +2783,7 @@ QDF_STATUS lim_deauth_tx_complete_cnf(void *context,
 				      uint32_t tx_success,
 				      void *params)
 {
-	tpAniSirGlobal mac_ctx = (tpAniSirGlobal)context;
+	struct mac_context *mac_ctx = (struct mac_context *)context;
 
 	pe_debug("tx_success: %d", tx_success);
 
@@ -2795,7 +2795,7 @@ static QDF_STATUS lim_deauth_tx_complete_cnf_handler(void *context,
 						     uint32_t tx_success,
 						     void *params)
 {
-	tpAniSirGlobal mac_ctx = (tpAniSirGlobal)context;
+	struct mac_context *mac_ctx = (struct mac_context *)context;
 	QDF_STATUS status_code;
 	struct scheduler_msg msg = {0};
 
@@ -2830,7 +2830,7 @@ static QDF_STATUS lim_deauth_tx_complete_cnf_handler(void *context,
  */
 
 void
-lim_send_disassoc_mgmt_frame(tpAniSirGlobal mac,
+lim_send_disassoc_mgmt_frame(struct mac_context *mac,
 			     uint16_t nReason,
 			     tSirMacAddr peer,
 			     struct pe_session *pe_session, bool waitForAck)
@@ -3003,7 +3003,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal mac,
  */
 
 void
-lim_send_deauth_mgmt_frame(tpAniSirGlobal mac,
+lim_send_deauth_mgmt_frame(struct mac_context *mac,
 			   uint16_t nReason,
 			   tSirMacAddr peer,
 			   struct pe_session *pe_session, bool waitForAck)
@@ -3212,7 +3212,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal mac,
  */
 
 QDF_STATUS
-lim_send_meas_report_frame(tpAniSirGlobal mac,
+lim_send_meas_report_frame(struct mac_context *mac,
 			   tpSirMacMeasReqActionFrame pMeasReqFrame,
 			   tSirMacAddr peer, struct pe_session *pe_session)
 {
@@ -3338,7 +3338,7 @@ lim_send_meas_report_frame(tpAniSirGlobal mac,
  */
 
 void
-lim_send_tpc_request_frame(tpAniSirGlobal mac,
+lim_send_tpc_request_frame(struct mac_context *mac,
 			   tSirMacAddr peer, struct pe_session *pe_session)
 {
 	tDot11fTPCRequest frm;
@@ -3435,7 +3435,7 @@ lim_send_tpc_request_frame(tpAniSirGlobal mac,
  */
 
 QDF_STATUS
-lim_send_tpc_report_frame(tpAniSirGlobal mac,
+lim_send_tpc_report_frame(struct mac_context *mac,
 			  tpSirMacTpcReqActionFrame pTpcReqFrame,
 			  tSirMacAddr peer, struct pe_session *pe_session)
 {
@@ -3546,7 +3546,7 @@ lim_send_tpc_report_frame(tpAniSirGlobal mac,
  */
 
 QDF_STATUS
-lim_send_channel_switch_mgmt_frame(tpAniSirGlobal mac,
+lim_send_channel_switch_mgmt_frame(struct mac_context *mac,
 				   tSirMacAddr peer,
 				   uint8_t nMode,
 				   uint8_t nNewChannel,
@@ -3666,7 +3666,7 @@ lim_send_channel_switch_mgmt_frame(tpAniSirGlobal mac,
  */
 
 QDF_STATUS
-lim_send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx,
+lim_send_extended_chan_switch_action_frame(struct mac_context *mac_ctx,
 		tSirMacAddr peer, uint8_t mode, uint8_t new_op_class,
 		uint8_t new_channel, uint8_t count, struct pe_session *session_entry)
 {
@@ -3837,7 +3837,7 @@ static QDF_STATUS lim_oper_chan_change_confirm_tx_complete_cnf(
  */
 
 QDF_STATUS
-lim_p2p_oper_chan_change_confirm_action_frame(tpAniSirGlobal mac_ctx,
+lim_p2p_oper_chan_change_confirm_action_frame(struct mac_context *mac_ctx,
 		tSirMacAddr peer, struct pe_session *session_entry)
 {
 	tDot11fp2p_oper_chan_change_confirm frm;
@@ -3951,7 +3951,7 @@ lim_p2p_oper_chan_change_confirm_action_frame(tpAniSirGlobal mac_ctx,
 
 
 QDF_STATUS
-lim_send_vht_opmode_notification_frame(tpAniSirGlobal mac,
+lim_send_vht_opmode_notification_frame(struct mac_context *mac,
 				       tSirMacAddr peer,
 				       uint8_t nMode, struct pe_session *pe_session)
 {
@@ -4071,7 +4071,7 @@ lim_send_vht_opmode_notification_frame(tpAniSirGlobal mac,
  */
 
 QDF_STATUS
-lim_send_neighbor_report_request_frame(tpAniSirGlobal mac,
+lim_send_neighbor_report_request_frame(struct mac_context *mac,
 				       tpSirMacNeighborReportReq pNeighborReq,
 				       tSirMacAddr peer, struct pe_session *pe_session)
 {
@@ -4208,7 +4208,7 @@ returnAfterError:
  */
 
 QDF_STATUS
-lim_send_link_report_action_frame(tpAniSirGlobal mac,
+lim_send_link_report_action_frame(struct mac_context *mac,
 				  tpSirMacLinkReport pLinkReport,
 				  tSirMacAddr peer, struct pe_session *pe_session)
 {
@@ -4336,7 +4336,7 @@ returnAfterError:
 } /* End lim_send_link_report_action_frame. */
 
 QDF_STATUS
-lim_send_radio_measure_report_action_frame(tpAniSirGlobal mac,
+lim_send_radio_measure_report_action_frame(struct mac_context *mac,
 				uint8_t dialog_token,
 				uint8_t num_report,
 				bool is_last_frame,
@@ -4518,7 +4518,7 @@ returnAfterError:
  * \sa lim_send_sa_query_request_frame
  *
  *
- * \param mac    The global tpAniSirGlobal object
+ * \param mac    The global struct mac_context *object
  *
  * \param transId Transaction identifier
  *
@@ -4530,7 +4530,7 @@ returnAfterError:
  *         QDF_STATUS_E_FAILURE is some problem is encountered
  */
 
-QDF_STATUS lim_send_sa_query_request_frame(tpAniSirGlobal mac, uint8_t *transId,
+QDF_STATUS lim_send_sa_query_request_frame(struct mac_context *mac, uint8_t *transId,
 					      tSirMacAddr peer,
 					      struct pe_session *pe_session)
 {
@@ -4648,7 +4648,7 @@ returnAfterError:
  * \sa lim_send_sa_query_response_frame
  *
  *
- * \param mac    The global tpAniSirGlobal object
+ * \param mac    The global struct mac_context *object
  *
  * \param transId Transaction identifier received in SA query request action frame
  *
@@ -4660,7 +4660,7 @@ returnAfterError:
  *         QDF_STATUS_E_FAILURE is some problem is encountered
  */
 
-QDF_STATUS lim_send_sa_query_response_frame(tpAniSirGlobal mac,
+QDF_STATUS lim_send_sa_query_response_frame(struct mac_context *mac,
 					       uint8_t *transId, tSirMacAddr peer,
 					       struct pe_session *pe_session)
 {
@@ -4791,7 +4791,7 @@ returnAfterError:
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS lim_send_addba_response_frame(tpAniSirGlobal mac_ctx,
+QDF_STATUS lim_send_addba_response_frame(struct mac_context *mac_ctx,
 		tSirMacAddr peer_mac, uint16_t tid,
 		struct pe_session *session, uint8_t addba_extn_present,
 		uint8_t amsdu_support)
@@ -4984,7 +4984,7 @@ error_addba_rsp:
  *
  * Return: None
  */
-static void lim_tx_mgmt_frame(tpAniSirGlobal mac_ctx,
+static void lim_tx_mgmt_frame(struct mac_context *mac_ctx,
 	struct sir_mgmt_msg *mb_msg, uint32_t msg_len,
 	void *packet, uint8_t *frame)
 {
@@ -5027,7 +5027,7 @@ static void lim_tx_mgmt_frame(tpAniSirGlobal mac_ctx,
 	}
 }
 
-void lim_send_mgmt_frame_tx(tpAniSirGlobal mac_ctx,
+void lim_send_mgmt_frame_tx(struct mac_context *mac_ctx,
 		struct scheduler_msg *msg)
 {
 	struct sir_mgmt_msg *mb_msg = (struct sir_mgmt_msg *)msg->bodyptr;

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

@@ -57,7 +57,7 @@
  *
  * @return success if message send is ok, else false.
  */
-QDF_STATUS lim_send_cf_params(tpAniSirGlobal mac, uint8_t bssIdx,
+QDF_STATUS lim_send_cf_params(struct mac_context *mac, uint8_t bssIdx,
 				 uint8_t cfpCount, uint8_t cfpPeriod)
 {
 	tpUpdateCFParams pCFParams = NULL;
@@ -98,7 +98,7 @@ QDF_STATUS lim_send_cf_params(tpAniSirGlobal mac, uint8_t bssIdx,
  *
  * @return success if message send is ok, else false.
  */
-QDF_STATUS lim_send_beacon_params(tpAniSirGlobal mac,
+QDF_STATUS lim_send_beacon_params(struct mac_context *mac,
 				     tpUpdateBeaconParams pUpdatedBcnParams,
 				     struct pe_session *pe_session)
 {
@@ -158,7 +158,7 @@ QDF_STATUS lim_send_beacon_params(tpAniSirGlobal mac,
  *
  * @return success if message send is ok, else false.
  */
-QDF_STATUS lim_send_switch_chnl_params(tpAniSirGlobal mac,
+QDF_STATUS lim_send_switch_chnl_params(struct mac_context *mac,
 					  uint8_t chnlNumber,
 					  uint8_t ch_center_freq_seg0,
 					  uint8_t ch_center_freq_seg1,
@@ -275,7 +275,7 @@ QDF_STATUS lim_send_switch_chnl_params(tpAniSirGlobal mac,
  *
  * @return success if message send is ok, else false.
  */
-QDF_STATUS lim_send_edca_params(tpAniSirGlobal mac,
+QDF_STATUS lim_send_edca_params(struct mac_context *mac,
 				   tSirMacEdcaParamRecord *pUpdatedEdcaParams,
 				   uint16_t bssIdx, bool mu_edca)
 {
@@ -325,7 +325,7 @@ QDF_STATUS lim_send_edca_params(tpAniSirGlobal mac,
  * Return: none
  */
 
-void lim_set_active_edca_params(tpAniSirGlobal mac_ctx,
+void lim_set_active_edca_params(struct mac_context *mac_ctx,
 				tSirMacEdcaParamRecord *edca_params,
 				struct pe_session *pe_session)
 {
@@ -426,11 +426,11 @@ void lim_set_active_edca_params(tpAniSirGlobal mac_ctx,
 /** ---------------------------------------------------------
    \fn      lim_set_link_state
    \brief   LIM sends a message to WMA to set the link state
-   \param   tpAniSirGlobal  mac
+   \param   struct mac_context * mac
    \param   tSirLinkState      state
    \return  None
    -----------------------------------------------------------*/
-QDF_STATUS lim_set_link_state(tpAniSirGlobal mac, tSirLinkState state,
+QDF_STATUS lim_set_link_state(struct mac_context *mac, tSirLinkState state,
 				 tSirMacAddr bssId, tSirMacAddr selfMacAddr,
 				 tpSetLinkStateCallback callback,
 				 void *callbackArg)
@@ -466,7 +466,7 @@ QDF_STATUS lim_set_link_state(tpAniSirGlobal mac, tSirLinkState state,
 	return retCode;
 }
 
-extern QDF_STATUS lim_set_link_state_ft(tpAniSirGlobal mac, tSirLinkState
+extern QDF_STATUS lim_set_link_state_ft(struct mac_context *mac, tSirLinkState
 					   state, tSirMacAddr bssId,
 					   tSirMacAddr selfMacAddr, int ft,
 					   struct pe_session *pe_session)
@@ -505,7 +505,7 @@ extern QDF_STATUS lim_set_link_state_ft(tpAniSirGlobal mac, tSirLinkState
 	return retCode;
 }
 
-QDF_STATUS lim_send_mode_update(tpAniSirGlobal mac,
+QDF_STATUS lim_send_mode_update(struct mac_context *mac,
 				   tUpdateVHTOpMode *pTempParam,
 				   struct pe_session *pe_session)
 {
@@ -540,7 +540,7 @@ QDF_STATUS lim_send_mode_update(tpAniSirGlobal mac,
 	return retCode;
 }
 
-QDF_STATUS lim_send_rx_nss_update(tpAniSirGlobal mac,
+QDF_STATUS lim_send_rx_nss_update(struct mac_context *mac,
 				     tUpdateRxNss *pTempParam,
 				     struct pe_session *pe_session)
 {
@@ -573,7 +573,7 @@ QDF_STATUS lim_send_rx_nss_update(tpAniSirGlobal mac,
 	return retCode;
 }
 
-QDF_STATUS lim_set_membership(tpAniSirGlobal mac,
+QDF_STATUS lim_set_membership(struct mac_context *mac,
 				 tUpdateMembership *pTempParam,
 				 struct pe_session *pe_session)
 {
@@ -608,7 +608,7 @@ QDF_STATUS lim_set_membership(tpAniSirGlobal mac,
 	return retCode;
 }
 
-QDF_STATUS lim_set_user_pos(tpAniSirGlobal mac,
+QDF_STATUS lim_set_user_pos(struct mac_context *mac,
 			       tUpdateUserPos *pTempParam,
 			       struct pe_session *pe_session)
 {
@@ -654,7 +654,7 @@ QDF_STATUS lim_set_user_pos(tpAniSirGlobal mac,
  *
  * Return: status of operation
  */
-QDF_STATUS lim_send_exclude_unencrypt_ind(tpAniSirGlobal mac,
+QDF_STATUS lim_send_exclude_unencrypt_ind(struct mac_context *mac,
 					     bool excludeUnenc,
 					     struct pe_session *pe_session)
 {
@@ -697,7 +697,7 @@ QDF_STATUS lim_send_exclude_unencrypt_ind(tpAniSirGlobal mac,
  *
  * Return: status of operation
  */
-QDF_STATUS lim_send_ht40_obss_scanind(tpAniSirGlobal mac_ctx,
+QDF_STATUS lim_send_ht40_obss_scanind(struct mac_context *mac_ctx,
 						struct pe_session *session)
 {
 	QDF_STATUS ret = QDF_STATUS_SUCCESS;

core/mac/src/pe/lim/lim_send_messages.h

@@ -34,27 +34,27 @@
 #include "lim_types.h"
 #include "wma_if.h"
 #include "sir_params.h"
-QDF_STATUS lim_send_cf_params(tpAniSirGlobal mac, uint8_t bssIdx,
+QDF_STATUS lim_send_cf_params(struct mac_context *mac, uint8_t bssIdx,
 				 uint8_t cfpCount, uint8_t cfpPeriod);
-QDF_STATUS lim_send_beacon_params(tpAniSirGlobal mac,
+QDF_STATUS lim_send_beacon_params(struct mac_context *mac,
 				     tpUpdateBeaconParams pUpdatedBcnParams,
 				     struct pe_session *pe_session);
-/* QDF_STATUS lim_send_beacon_params(tpAniSirGlobal mac, tpUpdateBeaconParams pUpdatedBcnParams); */
-QDF_STATUS lim_send_mode_update(tpAniSirGlobal mac,
+/* QDF_STATUS lim_send_beacon_params(struct mac_context *mac, tpUpdateBeaconParams pUpdatedBcnParams); */
+QDF_STATUS lim_send_mode_update(struct mac_context *mac,
 				   tUpdateVHTOpMode *tempParam,
 				   struct pe_session *pe_session);
-QDF_STATUS lim_send_rx_nss_update(tpAniSirGlobal mac,
+QDF_STATUS lim_send_rx_nss_update(struct mac_context *mac,
 				     tUpdateRxNss *tempParam,
 				     struct pe_session *pe_session);
 
-QDF_STATUS lim_set_membership(tpAniSirGlobal mac,
+QDF_STATUS lim_set_membership(struct mac_context *mac,
 				 tUpdateMembership *pTempParam,
 				 struct pe_session *pe_session);
 
-QDF_STATUS lim_set_user_pos(tpAniSirGlobal mac,
+QDF_STATUS lim_set_user_pos(struct mac_context *mac,
 			       tUpdateUserPos *pTempParam,
 			       struct pe_session *pe_session);
-QDF_STATUS lim_send_switch_chnl_params(tpAniSirGlobal mac,
+QDF_STATUS lim_send_switch_chnl_params(struct mac_context *mac,
 					  uint8_t chnlNumber,
 					  uint8_t ch_center_freq_seg0,
 					  uint8_t ch_center_freq_seg1,
@@ -65,18 +65,18 @@ QDF_STATUS lim_send_switch_chnl_params(tpAniSirGlobal mac,
 					  uint32_t cac_duration_ms,
 					  uint32_t dfs_regdomain);
 
-QDF_STATUS lim_send_edca_params(tpAniSirGlobal mac,
+QDF_STATUS lim_send_edca_params(struct mac_context *mac,
 				   tSirMacEdcaParamRecord *pUpdatedEdcaParams,
 				   uint16_t bssIdx, bool mu_edca);
-QDF_STATUS lim_set_link_state(tpAniSirGlobal mac, tSirLinkState state,
+QDF_STATUS lim_set_link_state(struct mac_context *mac, tSirLinkState state,
 				 tSirMacAddr bssId, tSirMacAddr selfMac,
 				 tpSetLinkStateCallback callback,
 				 void *callbackArg);
-extern QDF_STATUS lim_set_link_state_ft(tpAniSirGlobal mac, tSirLinkState
+extern QDF_STATUS lim_set_link_state_ft(struct mac_context *mac, tSirLinkState
 					   state, tSirMacAddr bssId,
 					   tSirMacAddr selfMacAddr, int ft,
 					   struct pe_session *pe_session);
-void lim_set_active_edca_params(tpAniSirGlobal mac,
+void lim_set_active_edca_params(struct mac_context *mac,
 				tSirMacEdcaParamRecord *plocalEdcaParams,
 				struct pe_session *pe_session);
 #define CAPABILITY_FILTER_MASK  0x73CF
@@ -90,12 +90,12 @@ void lim_set_active_edca_params(tpAniSirGlobal mac,
 #define VHTOP_CHWIDTH_MASK      0xFC
 
 #ifdef WLAN_FEATURE_11W
-QDF_STATUS lim_send_exclude_unencrypt_ind(tpAniSirGlobal mac,
+QDF_STATUS lim_send_exclude_unencrypt_ind(struct mac_context *mac,
 					     bool excludeUnenc,
 					     struct pe_session *pe_session);
 #endif
-QDF_STATUS lim_send_ht40_obss_scanind(tpAniSirGlobal mac_ctx,
+QDF_STATUS lim_send_ht40_obss_scanind(struct mac_context *mac_ctx,
 						struct pe_session *session);
-void lim_handle_sme_join_result(tpAniSirGlobal,
+void lim_handle_sme_join_result(struct mac_context *,
 		tSirResultCodes, uint16_t, struct pe_session *);
 #endif

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

@@ -57,7 +57,7 @@
 #include "lim_process_fils.h"
 #include "wma.h"
 
-static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx,
+static void lim_handle_join_rsp_status(struct mac_context *mac_ctx,
 	struct pe_session *session_entry, tSirResultCodes result_code,
 	tpSirSmeJoinRsp sme_join_rsp);
 
@@ -77,7 +77,7 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx,
  */
 
 void
-lim_send_sme_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type,
+lim_send_sme_rsp(struct mac_context *mac_ctx, uint16_t msg_type,
 	 tSirResultCodes result_code, uint8_t sme_session_id,
 	 uint16_t sme_transaction_id)
 {
@@ -131,7 +131,7 @@ lim_send_sme_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type,
  * Return: None
  */
 void
-lim_send_sme_roc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type,
+lim_send_sme_roc_rsp(struct mac_context *mac_ctx, uint16_t msg_type,
 	 tSirResultCodes result_code, uint8_t sme_session_id,
 	 uint32_t scan_id)
 {
@@ -172,7 +172,7 @@ lim_send_sme_roc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type,
  *
  * Return: Returns the populated rate_flags
  */
-uint32_t lim_get_max_rate_flags(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds)
+uint32_t lim_get_max_rate_flags(struct mac_context *mac_ctx, tpDphHashNode sta_ds)
 {
 	uint32_t rate_flags = 0;
 
@@ -222,7 +222,7 @@ uint32_t lim_get_max_rate_flags(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds)
  *
  * Return: None
  */
-static void lim_send_sme_join_reassoc_rsp_after_resume(tpAniSirGlobal mac_ctx,
+static void lim_send_sme_join_reassoc_rsp_after_resume(struct mac_context *mac_ctx,
 	QDF_STATUS status, uint32_t *ctx)
 {
 	struct scheduler_msg msg = {0};
@@ -248,7 +248,7 @@ static void lim_send_sme_join_reassoc_rsp_after_resume(tpAniSirGlobal mac_ctx,
  *
  * Return: None
  */
-static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx,
+static void lim_handle_join_rsp_status(struct mac_context *mac_ctx,
 	struct pe_session *session_entry, tSirResultCodes result_code,
 	tpSirSmeJoinRsp sme_join_rsp)
 {
@@ -471,7 +471,7 @@ static inline void lim_update_fils_seq_num(tpSirSmeJoinRsp sme_join_rsp,
  */
 
 void
-lim_send_sme_join_reassoc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type,
+lim_send_sme_join_reassoc_rsp(struct mac_context *mac_ctx, uint16_t msg_type,
 	tSirResultCodes result_code, uint16_t prot_status_code,
 	struct pe_session *session_entry, uint8_t sme_session_id,
 	uint16_t sme_transaction_id)
@@ -601,7 +601,7 @@ lim_send_sme_join_reassoc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type,
  */
 
 void
-lim_send_sme_start_bss_rsp(tpAniSirGlobal mac,
+lim_send_sme_start_bss_rsp(struct mac_context *mac,
 			   uint16_t msgType, tSirResultCodes resultCode,
 			   struct pe_session *pe_session, uint8_t smesessionId,
 			   uint16_t smetransactionId)
@@ -730,7 +730,7 @@ lim_send_sme_start_bss_rsp(tpAniSirGlobal mac,
 	lim_sys_process_mmh_msg_api(mac, &mmhMsg, ePROT);
 } /*** end lim_send_sme_start_bss_rsp() ***/
 
-void lim_send_sme_disassoc_deauth_ntf(tpAniSirGlobal mac,
+void lim_send_sme_disassoc_deauth_ntf(struct mac_context *mac,
 				      QDF_STATUS status, uint32_t *pCtx)
 {
 	struct scheduler_msg mmhMsg = {0};
@@ -774,7 +774,7 @@ void lim_send_sme_disassoc_deauth_ntf(tpAniSirGlobal mac,
  * @return None
  */
 void
-lim_send_sme_disassoc_ntf(tpAniSirGlobal mac,
+lim_send_sme_disassoc_ntf(struct mac_context *mac,
 			  tSirMacAddr peerMacAddr,
 			  tSirResultCodes reasonCode,
 			  uint16_t disassocTrigger,
@@ -955,7 +955,7 @@ error:
    \sa
    ----------------------------------------------------------------- */
 void
-lim_send_sme_disassoc_ind(tpAniSirGlobal mac, tpDphHashNode pStaDs,
+lim_send_sme_disassoc_ind(struct mac_context *mac, tpDphHashNode pStaDs,
 			  struct pe_session *pe_session)
 {
 	struct scheduler_msg mmhMsg = {0};
@@ -1009,7 +1009,7 @@ lim_send_sme_disassoc_ind(tpAniSirGlobal mac, tpDphHashNode pStaDs,
    \sa
    ----------------------------------------------------------------- */
 void
-lim_send_sme_deauth_ind(tpAniSirGlobal mac, tpDphHashNode pStaDs,
+lim_send_sme_deauth_ind(struct mac_context *mac, tpDphHashNode pStaDs,
 			struct pe_session *pe_session)
 {
 	struct scheduler_msg mmhMsg = {0};
@@ -1080,7 +1080,7 @@ lim_send_sme_deauth_ind(tpAniSirGlobal mac, tpDphHashNode pStaDs,
  * @return None
  */
 void
-lim_send_sme_tdls_del_sta_ind(tpAniSirGlobal mac, tpDphHashNode pStaDs,
+lim_send_sme_tdls_del_sta_ind(struct mac_context *mac, tpDphHashNode pStaDs,
 			      struct pe_session *pe_session, uint16_t reasonCode)
 {
 	struct tdls_event_info info;
@@ -1117,7 +1117,7 @@ lim_send_sme_tdls_del_sta_ind(tpAniSirGlobal mac, tpDphHashNode pStaDs,
  * @return None
  */
 void
-lim_send_sme_mgmt_tx_completion(tpAniSirGlobal mac,
+lim_send_sme_mgmt_tx_completion(struct mac_context *mac,
 				uint32_t sme_session_id,
 				uint32_t txCompleteStatus)
 {
@@ -1152,7 +1152,7 @@ lim_send_sme_mgmt_tx_completion(tpAniSirGlobal mac,
 
 #endif /* FEATURE_WLAN_TDLS */
 
-QDF_STATUS lim_prepare_disconnect_done_ind(tpAniSirGlobal mac_ctx,
+QDF_STATUS lim_prepare_disconnect_done_ind(struct mac_context *mac_ctx,
 					   uint32_t **msg,
 					   uint8_t session_id,
 					   tSirResultCodes reason_code,
@@ -1217,7 +1217,7 @@ QDF_STATUS lim_prepare_disconnect_done_ind(tpAniSirGlobal mac_ctx,
  * @return None
  */
 void
-lim_send_sme_deauth_ntf(tpAniSirGlobal mac, tSirMacAddr peerMacAddr,
+lim_send_sme_deauth_ntf(struct mac_context *mac, tSirMacAddr peerMacAddr,
 			tSirResultCodes reasonCode, uint16_t deauthTrigger,
 			uint16_t aid, uint8_t smesessionId,
 			uint16_t smetransactionId)
@@ -1339,7 +1339,7 @@ lim_send_sme_deauth_ntf(tpAniSirGlobal mac, tSirMacAddr peerMacAddr,
  * Return: None
  */
 void
-lim_send_sme_wm_status_change_ntf(tpAniSirGlobal mac_ctx,
+lim_send_sme_wm_status_change_ntf(struct mac_context *mac_ctx,
 	tSirSmeStatusChangeCode status_change_code,
 	uint32_t *status_change_info, uint16_t info_len, uint8_t session_id)
 {
@@ -1421,7 +1421,7 @@ lim_send_sme_wm_status_change_ntf(tpAniSirGlobal mac_ctx,
  * @return None
  */
 void
-lim_send_sme_set_context_rsp(tpAniSirGlobal mac,
+lim_send_sme_set_context_rsp(struct mac_context *mac,
 			     struct qdf_mac_addr peer_macaddr, uint16_t aid,
 			     tSirResultCodes resultCode,
 			     struct pe_session *pe_session, uint8_t smesessionId,
@@ -1474,7 +1474,7 @@ lim_send_sme_set_context_rsp(tpAniSirGlobal mac,
    \sa
    ----------------------------------------------------------------- */
 void
-lim_send_sme_addts_rsp(tpAniSirGlobal mac, uint8_t rspReqd, uint32_t status,
+lim_send_sme_addts_rsp(struct mac_context *mac, uint8_t rspReqd, uint32_t status,
 		       struct pe_session *pe_session, tSirMacTspecIE tspec,
 		       uint8_t smesessionId, uint16_t smetransactionId)
 {
@@ -1516,7 +1516,7 @@ lim_send_sme_addts_rsp(tpAniSirGlobal mac, uint8_t rspReqd, uint32_t status,
 }
 
 void
-lim_send_sme_delts_rsp(tpAniSirGlobal mac, tpSirDeltsReq delts, uint32_t status,
+lim_send_sme_delts_rsp(struct mac_context *mac, tpSirDeltsReq delts, uint32_t status,
 		       struct pe_session *pe_session, uint8_t smesessionId,
 		       uint16_t smetransactionId)
 {
@@ -1568,7 +1568,7 @@ lim_send_sme_delts_rsp(tpAniSirGlobal mac, tpSirDeltsReq delts, uint32_t status,
 }
 
 void
-lim_send_sme_delts_ind(tpAniSirGlobal mac, tpSirDeltsReqInfo delts, uint16_t aid,
+lim_send_sme_delts_ind(struct mac_context *mac, tpSirDeltsReqInfo delts, uint16_t aid,
 		       struct pe_session *pe_session)
 {
 	tpSirDeltsRsp rsp;
@@ -1631,7 +1631,7 @@ lim_send_sme_delts_ind(tpAniSirGlobal mac, tpSirDeltsReqInfo delts, uint16_t aid
  */
 
 void
-lim_send_sme_pe_statistics_rsp(tpAniSirGlobal mac, uint16_t msgType, void *stats)
+lim_send_sme_pe_statistics_rsp(struct mac_context *mac, uint16_t msgType, void *stats)
 {
 	struct scheduler_msg mmhMsg = {0};
 	uint8_t sessionId;
@@ -1675,7 +1675,7 @@ lim_send_sme_pe_statistics_rsp(tpAniSirGlobal mac, uint16_t msgType, void *stats
  *
  * Return: None
  */
-void lim_send_sme_pe_ese_tsm_rsp(tpAniSirGlobal mac,
+void lim_send_sme_pe_ese_tsm_rsp(struct mac_context *mac,
 				 tAniGetTsmStatsRsp *pStats)
 {
 	struct scheduler_msg mmhMsg = {0};
@@ -1717,7 +1717,7 @@ void lim_send_sme_pe_ese_tsm_rsp(tpAniSirGlobal mac,
 #endif /* FEATURE_WLAN_ESE */
 
 void
-lim_send_sme_ibss_peer_ind(tpAniSirGlobal mac,
+lim_send_sme_ibss_peer_ind(struct mac_context *mac,
 			   tSirMacAddr peerMacAddr,
 			   uint16_t staIndex,
 			   uint8_t *beacon,
@@ -1759,7 +1759,7 @@ lim_send_sme_ibss_peer_ind(tpAniSirGlobal mac,
  *
  * Return: None
  */
-static QDF_STATUS lim_process_csa_wbw_ie(tpAniSirGlobal mac_ctx,
+static QDF_STATUS lim_process_csa_wbw_ie(struct mac_context *mac_ctx,
 		struct csa_offload_params *csa_params,
 		tLimWiderBWChannelSwitchInfo *chnl_switch_info,
 		struct pe_session *session_entry)
@@ -1891,7 +1891,7 @@ prnt_log:
  *
  * Return: None
  */
-void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx,
+void lim_handle_csa_offload_msg(struct mac_context *mac_ctx,
 				struct scheduler_msg *msg)
 {
 	struct pe_session *session_entry;
@@ -2164,7 +2164,7 @@ err:
    \sa
    --------------------------------------------------------------------------*/
 
-void lim_handle_delete_bss_rsp(tpAniSirGlobal mac, struct scheduler_msg *MsgQ)
+void lim_handle_delete_bss_rsp(struct mac_context *mac, struct scheduler_msg *MsgQ)
 {
 	struct pe_session *pe_session;
 	tpDeleteBssParams pDelBss = (tpDeleteBssParams) (MsgQ->bodyptr);
@@ -2208,7 +2208,7 @@ void lim_handle_delete_bss_rsp(tpAniSirGlobal mac, struct scheduler_msg *MsgQ)
    \sa
    ----------------------------------------------------------------- */
 void
-lim_send_sme_aggr_qos_rsp(tpAniSirGlobal mac, tpSirAggrQosRsp aggrQosRsp,
+lim_send_sme_aggr_qos_rsp(struct mac_context *mac, tpSirAggrQosRsp aggrQosRsp,
 			  uint8_t smesessionId)
 {
 	struct scheduler_msg mmhMsg = {0};
@@ -2223,7 +2223,7 @@ lim_send_sme_aggr_qos_rsp(tpAniSirGlobal mac, tpSirAggrQosRsp aggrQosRsp,
 	return;
 }
 
-void lim_send_sme_max_assoc_exceeded_ntf(tpAniSirGlobal mac, tSirMacAddr peerMacAddr,
+void lim_send_sme_max_assoc_exceeded_ntf(struct mac_context *mac, tSirMacAddr peerMacAddr,
 					 uint8_t smesessionId)
 {
 	struct scheduler_msg mmhMsg = {0};
@@ -2261,7 +2261,7 @@ void lim_send_sme_max_assoc_exceeded_ntf(tpAniSirGlobal mac, tSirMacAddr peerMac
    \param pChnlParams - Channel switch params
    --------------------------------------------------------------------*/
 void
-lim_send_sme_ap_channel_switch_resp(tpAniSirGlobal mac,
+lim_send_sme_ap_channel_switch_resp(struct mac_context *mac,
 				    struct pe_session *pe_session,
 				    tpSwitchChannelParams pChnlParams)
 {
@@ -2342,7 +2342,7 @@ lim_send_sme_ap_channel_switch_resp(tpAniSirGlobal mac,
  *  Return: none
  */
 static void
-lim_send_bss_color_change_ie_update(tpAniSirGlobal mac_ctx,
+lim_send_bss_color_change_ie_update(struct mac_context *mac_ctx,
 						struct pe_session *session)
 {
 	/* Update the beacon template and send to FW */
@@ -2358,7 +2358,7 @@ lim_send_bss_color_change_ie_update(tpAniSirGlobal mac_ctx,
 }
 
 static void
-lim_handle_bss_color_change_ie(tpAniSirGlobal mac_ctx,
+lim_handle_bss_color_change_ie(struct mac_context *mac_ctx,
 					struct pe_session *session)
 {
 	tUpdateBeaconParams beacon_params;
@@ -2395,14 +2395,14 @@ lim_handle_bss_color_change_ie(tpAniSirGlobal mac_ctx,
 
 #else
 static void
-lim_handle_bss_color_change_ie(tpAniSirGlobal mac_ctx,
+lim_handle_bss_color_change_ie(struct mac_context *mac_ctx,
 					struct pe_session *session)
 {
 }
 #endif
 
 void
-lim_process_beacon_tx_success_ind(tpAniSirGlobal mac_ctx, uint16_t msgType,
+lim_process_beacon_tx_success_ind(struct mac_context *mac_ctx, uint16_t msgType,
 				  void *event)
 {
 	struct pe_session *session;

core/mac/src/pe/lim/lim_send_sme_rsp_messages.h

@@ -35,14 +35,14 @@
 #include "sir_mac_prot_def.h"
 
 /* Functions for sending responses to Host */
-void lim_send_sme_rsp(tpAniSirGlobal, uint16_t, tSirResultCodes, uint8_t,
+void lim_send_sme_rsp(struct mac_context *, uint16_t, tSirResultCodes, uint8_t,
 		      uint16_t);
-void lim_send_sme_roc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type,
+void lim_send_sme_roc_rsp(struct mac_context *mac_ctx, uint16_t msg_type,
 	 tSirResultCodes result_code, uint8_t sme_session_id,
 	 uint32_t scan_id);
-void lim_send_sme_start_bss_rsp(tpAniSirGlobal, uint16_t, tSirResultCodes,
+void lim_send_sme_start_bss_rsp(struct mac_context *, uint16_t, tSirResultCodes,
 				struct pe_session *, uint8_t, uint16_t);
-void lim_send_sme_join_reassoc_rsp(tpAniSirGlobal, uint16_t, tSirResultCodes,
+void lim_send_sme_join_reassoc_rsp(struct mac_context *, uint16_t, tSirResultCodes,
 				   uint16_t, struct pe_session *, uint8_t, uint16_t);
 
 /*
@@ -56,60 +56,60 @@ void lim_send_sme_join_reassoc_rsp(tpAniSirGlobal, uint16_t, tSirResultCodes,
  *
  * Return: QDF Status
  */
-QDF_STATUS lim_prepare_disconnect_done_ind(tpAniSirGlobal mac_ctx,
+QDF_STATUS lim_prepare_disconnect_done_ind(struct mac_context *mac_ctx,
 					   uint32_t **msg,
 					   uint8_t session_id,
 					   tSirResultCodes reason_code,
 					   uint8_t *peer_mac_addr);
-void lim_send_sme_disassoc_ntf(tpAniSirGlobal, tSirMacAddr, tSirResultCodes,
+void lim_send_sme_disassoc_ntf(struct mac_context *, tSirMacAddr, tSirResultCodes,
 			       uint16_t, uint16_t, uint8_t, uint16_t, struct pe_session *);
-void lim_send_sme_deauth_ntf(tpAniSirGlobal, tSirMacAddr, tSirResultCodes, uint16_t,
+void lim_send_sme_deauth_ntf(struct mac_context *, tSirMacAddr, tSirResultCodes, uint16_t,
 			     uint16_t, uint8_t, uint16_t);
-void lim_send_sme_disassoc_ind(tpAniSirGlobal, tpDphHashNode, struct pe_session *);
-void lim_send_sme_deauth_ind(tpAniSirGlobal, tpDphHashNode,
+void lim_send_sme_disassoc_ind(struct mac_context *, tpDphHashNode, struct pe_session *);
+void lim_send_sme_deauth_ind(struct mac_context *, tpDphHashNode,
 			     struct pe_session *pe_session);
-void lim_send_sme_wm_status_change_ntf(tpAniSirGlobal, tSirSmeStatusChangeCode,
+void lim_send_sme_wm_status_change_ntf(struct mac_context *, tSirSmeStatusChangeCode,
 				       uint32_t *, uint16_t, uint8_t);
-void lim_send_sme_set_context_rsp(tpAniSirGlobal, struct qdf_mac_addr, uint16_t,
+void lim_send_sme_set_context_rsp(struct mac_context *, struct qdf_mac_addr, uint16_t,
 				  tSirResultCodes, struct pe_session *, uint8_t, uint16_t);
-void lim_handle_delete_bss_rsp(tpAniSirGlobal mac, struct scheduler_msg *MsgQ);
-void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx,
+void lim_handle_delete_bss_rsp(struct mac_context *mac, struct scheduler_msg *MsgQ);
+void lim_handle_csa_offload_msg(struct mac_context *mac_ctx,
 				struct scheduler_msg *msg);
 
 void
-lim_send_sme_aggr_qos_rsp(tpAniSirGlobal mac, tpSirAggrQosRsp aggrQosRsp,
+lim_send_sme_aggr_qos_rsp(struct mac_context *mac, tpSirAggrQosRsp aggrQosRsp,
 			  uint8_t smesessionId);
 
-void lim_send_sme_addts_rsp(tpAniSirGlobal mac, uint8_t rspReqd, uint32_t status,
+void lim_send_sme_addts_rsp(struct mac_context *mac, uint8_t rspReqd, uint32_t status,
 			    struct pe_session *pe_session, tSirMacTspecIE tspec,
 			    uint8_t smesessionId, uint16_t smetransactionId);
-void lim_send_sme_delts_rsp(tpAniSirGlobal mac, tpSirDeltsReq delts,
+void lim_send_sme_delts_rsp(struct mac_context *mac, tpSirDeltsReq delts,
 			    uint32_t status, struct pe_session *pe_session,
 			    uint8_t smessionId, uint16_t smetransactionId);
-void lim_send_sme_delts_ind(tpAniSirGlobal mac, tpSirDeltsReqInfo delts,
+void lim_send_sme_delts_ind(struct mac_context *mac, tpSirDeltsReqInfo delts,
 			    uint16_t aid, struct pe_session *);
-void lim_send_sme_stats_rsp(tpAniSirGlobal mac, uint16_t msgtype, void *stats);
+void lim_send_sme_stats_rsp(struct mac_context *mac, uint16_t msgtype, void *stats);
 
 #ifdef QCA_SUPPORT_CP_STATS
-static inline void lim_send_sme_pe_statistics_rsp(tpAniSirGlobal mac,
+static inline void lim_send_sme_pe_statistics_rsp(struct mac_context *mac,
 					uint16_t msgtype, void *stats) {}
 #else
-void lim_send_sme_pe_statistics_rsp(tpAniSirGlobal mac, uint16_t msgtype,
+void lim_send_sme_pe_statistics_rsp(struct mac_context *mac, uint16_t msgtype,
 				    void *stats);
 #endif /* QCA_SUPPORT_CP_STATS */
 
 #ifdef FEATURE_WLAN_ESE
-void lim_send_sme_pe_ese_tsm_rsp(tpAniSirGlobal mac, tAniGetTsmStatsRsp *pStats);
+void lim_send_sme_pe_ese_tsm_rsp(struct mac_context *mac, tAniGetTsmStatsRsp *pStats);
 #endif
 
-void lim_send_sme_ibss_peer_ind(tpAniSirGlobal mac, tSirMacAddr peerMacAddr,
+void lim_send_sme_ibss_peer_ind(struct mac_context *mac, tSirMacAddr peerMacAddr,
 				uint16_t staIndex, uint8_t *beacon,
 				uint16_t beaconLen, uint16_t msgType,
 				uint8_t sessionId);
-void lim_send_sme_max_assoc_exceeded_ntf(tpAniSirGlobal mac, tSirMacAddr peerMacAddr,
+void lim_send_sme_max_assoc_exceeded_ntf(struct mac_context *mac, tSirMacAddr peerMacAddr,
 					 uint8_t smesessionId);
 
-void lim_send_sme_ap_channel_switch_resp(tpAniSirGlobal mac,
+void lim_send_sme_ap_channel_switch_resp(struct mac_context *mac,
 					 struct pe_session *pe_session,
 					 tpSwitchChannelParams pChnlParams);
 /*
@@ -121,7 +121,7 @@ void lim_send_sme_ap_channel_switch_resp(tpAniSirGlobal mac,
  * @msg_type: msg_type
  */
 void
-lim_process_beacon_tx_success_ind(tpAniSirGlobal mac, uint16_t msgType,
+lim_process_beacon_tx_success_ind(struct mac_context *mac, uint16_t msgType,
 				  void *event);
 
 typedef enum {

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

@@ -51,7 +51,7 @@
    \return None
    ------------------------------------------------------------------*/
 void
-lim_get_session_info(tpAniSirGlobal mac, uint8_t *pBuf, uint8_t *sessionId,
+lim_get_session_info(struct mac_context *mac, uint8_t *pBuf, uint8_t *sessionId,
 		     uint16_t *transactionId)
 {
 	if (!pBuf) {
@@ -78,7 +78,7 @@ lim_get_session_info(tpAniSirGlobal mac, uint8_t *pBuf, uint8_t *sessionId,
  *
  * return: QDF_STATUS_SUCCESS:Success Error value: Failure
  */
-QDF_STATUS lim_send_disassoc_frm_req_ser_des(tpAniSirGlobal mac_ctx,
+QDF_STATUS lim_send_disassoc_frm_req_ser_des(struct mac_context *mac_ctx,
 			struct sme_send_disassoc_frm_req *disassoc_frm_req,
 			uint8_t *buf)
 {

core/mac/src/pe/lim/lim_ser_des_utils.h

@@ -37,7 +37,7 @@
 #include "lim_types.h"
 #include "lim_prop_exts_utils.h"
 
-void lim_get_session_info(tpAniSirGlobal mac, uint8_t *,
+void lim_get_session_info(struct mac_context *mac, uint8_t *,
 			  uint8_t *, uint16_t *);
 
 /* Byte String <--> uint16_t/uint32_t copy functions */
@@ -111,7 +111,7 @@ static inline uint16_t lim_get_u16_be(uint8_t *buf)
 	return (buf[0] << 8) | buf[1];
 }
 
-QDF_STATUS lim_send_disassoc_frm_req_ser_des(tpAniSirGlobal mac_ctx,
+QDF_STATUS lim_send_disassoc_frm_req_ser_des(struct mac_context *mac_ctx,
 		struct sme_send_disassoc_frm_req *disassoc_frm_req,
 		uint8_t *buf);
 

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

@@ -88,7 +88,7 @@ struct sDphHashNode *pe_get_session_dph_node_array(uint8_t session_id)
 
    --------------------------------------------------------------------------*/
 
-static void pe_init_beacon_params(tpAniSirGlobal mac,
+static void pe_init_beacon_params(struct mac_context *mac,
 				  struct pe_session *pe_session)
 {
 	pe_session->beaconParams.beaconInterval = 0;
@@ -134,7 +134,7 @@ static void pe_init_beacon_params(tpAniSirGlobal mac,
 static void pe_reset_protection_callback(void *ptr)
 {
 	struct pe_session *pe_session_entry = (struct pe_session *)ptr;
-	tpAniSirGlobal mac_ctx = pe_session_entry->mac_ctx;
+	struct mac_context *mac_ctx = pe_session_entry->mac_ctx;
 	int8_t i = 0;
 	tUpdateBeaconParams beacon_params;
 	uint16_t current_protection_state = 0;
@@ -278,7 +278,7 @@ restart_timer:
  *
  * Return: void
  */
-static void pe_init_pmf_comeback_timer(tpAniSirGlobal mac_ctx,
+static void pe_init_pmf_comeback_timer(struct mac_context *mac_ctx,
 struct pe_session *session, uint8_t session_id)
 {
 	QDF_STATUS status;
@@ -293,7 +293,7 @@ struct pe_session *session, uint8_t session_id)
 }
 #else
 static inline void
-pe_init_pmf_comeback_timer(tpAniSirGlobal mac_ctx,
+pe_init_pmf_comeback_timer(struct mac_context *mac_ctx,
 	struct pe_session *session, uint8_t session_id)
 {
 }
@@ -412,7 +412,7 @@ lim_get_peer_idxpool_size(uint16_t num_sta, tSirBssType bss_type)
 }
 #endif
 
-void lim_set_bcn_probe_filter(tpAniSirGlobal mac_ctx,
+void lim_set_bcn_probe_filter(struct mac_context *mac_ctx,
 				struct pe_session *session,
 				tSirMacSSid *ibss_ssid,
 				uint8_t sap_channel)
@@ -473,7 +473,7 @@ done:
 		filter->num_sap_sessions);
 }
 
-void lim_reset_bcn_probe_filter(tpAniSirGlobal mac_ctx,
+void lim_reset_bcn_probe_filter(struct mac_context *mac_ctx,
 				struct pe_session *session)
 {
 	struct mgmt_beacon_probe_filter *filter;
@@ -521,7 +521,7 @@ void lim_reset_bcn_probe_filter(tpAniSirGlobal mac_ctx,
 		filter->num_sap_sessions);
 }
 
-void lim_update_bcn_probe_filter(tpAniSirGlobal mac_ctx,
+void lim_update_bcn_probe_filter(struct mac_context *mac_ctx,
 					struct pe_session *session)
 {
 	struct mgmt_beacon_probe_filter *filter;
@@ -558,7 +558,7 @@ void lim_update_bcn_probe_filter(tpAniSirGlobal mac_ctx,
 		filter->num_sap_sessions);
 }
 
-struct pe_session *pe_create_session(tpAniSirGlobal mac,
+struct pe_session *pe_create_session(struct mac_context *mac,
 			      uint8_t *bssid,
 			      uint8_t *sessionId,
 			      uint16_t numSta, tSirBssType bssType,
@@ -744,7 +744,7 @@ free_dp_hash_table:
 
    \sa
    --------------------------------------------------------------------------*/
-struct pe_session *pe_find_session_by_bssid(tpAniSirGlobal mac, uint8_t *bssid,
+struct pe_session *pe_find_session_by_bssid(struct mac_context *mac, uint8_t *bssid,
 				     uint8_t *sessionId)
 {
 	uint8_t i;
@@ -773,7 +773,7 @@ struct pe_session *pe_find_session_by_bssid(tpAniSirGlobal mac, uint8_t *bssid,
    \return struct pe_session *         - pointer to the session context or NULL if session is not found.
    \sa
    --------------------------------------------------------------------------*/
-struct pe_session *pe_find_session_by_bss_idx(tpAniSirGlobal mac, uint8_t bssIdx)
+struct pe_session *pe_find_session_by_bss_idx(struct mac_context *mac, uint8_t bssIdx)
 {
 	uint8_t i;
 
@@ -801,7 +801,7 @@ struct pe_session *pe_find_session_by_bss_idx(tpAniSirGlobal mac, uint8_t bssIdx
 
    \sa
    --------------------------------------------------------------------------*/
-struct pe_session *pe_find_session_by_session_id(tpAniSirGlobal mac,
+struct pe_session *pe_find_session_by_session_id(struct mac_context *mac,
 					  uint8_t sessionId)
 {
 	if (sessionId >= mac->lim.maxBssId) {
@@ -827,7 +827,7 @@ struct pe_session *pe_find_session_by_session_id(tpAniSirGlobal mac,
  * Return: session pointer
  */
 struct pe_session *
-pe_find_session_by_sta_id(tpAniSirGlobal mac_ctx,
+pe_find_session_by_sta_id(struct mac_context *mac_ctx,
 			  uint8_t staid,
 			  uint8_t *session_id)
 {
@@ -863,7 +863,7 @@ pe_find_session_by_sta_id(tpAniSirGlobal mac_ctx,
  *
  * Return: void
  */
-void pe_delete_session(tpAniSirGlobal mac_ctx, struct pe_session *session)
+void pe_delete_session(struct mac_context *mac_ctx, struct pe_session *session)
 {
 	uint16_t i = 0;
 	uint16_t n;
@@ -1069,7 +1069,7 @@ void pe_delete_session(tpAniSirGlobal mac_ctx, struct pe_session *session)
    \sa
    --------------------------------------------------------------------------*/
 
-struct pe_session *pe_find_session_by_peer_sta(tpAniSirGlobal mac, uint8_t *sa,
+struct pe_session *pe_find_session_by_peer_sta(struct mac_context *mac, uint8_t *sa,
 					uint8_t *sessionId)
 {
 	uint8_t i;
@@ -1104,7 +1104,7 @@ struct pe_session *pe_find_session_by_peer_sta(tpAniSirGlobal mac, uint8_t *sa,
  *
  * Return: pe session entry for given sme session if found else NULL
  */
-struct pe_session *pe_find_session_by_sme_session_id(tpAniSirGlobal mac_ctx,
+struct pe_session *pe_find_session_by_sme_session_id(struct mac_context *mac_ctx,
 					      uint8_t sme_session_id)
 {
 	uint8_t i;
@@ -1128,7 +1128,7 @@ struct pe_session *pe_find_session_by_sme_session_id(tpAniSirGlobal mac_ctx,
  *
  * Return: pe session entry for given scan id if found else NULL
  */
-struct pe_session *pe_find_session_by_scan_id(tpAniSirGlobal mac_ctx,
+struct pe_session *pe_find_session_by_scan_id(struct mac_context *mac_ctx,
 				       uint32_t scan_id)
 {
 	uint8_t i;
@@ -1154,7 +1154,7 @@ struct pe_session *pe_find_session_by_scan_id(tpAniSirGlobal mac_ctx,
  * Return: 0 if there are no active sessions else return number of active
  *          sessions
  */
-uint8_t pe_get_active_session_count(tpAniSirGlobal mac_ctx)
+uint8_t pe_get_active_session_count(struct mac_context *mac_ctx)
 {
 	uint8_t i, active_session_count = 0;
 

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

@@ -40,7 +40,7 @@
  * Return: This function returns true if the session Id passed needs to be on
  *         a different channel than atleast one session already active.
  **/
-uint8_t is_lim_session_off_channel(tpAniSirGlobal mac_ctx, uint8_t session_id)
+uint8_t is_lim_session_off_channel(struct mac_context *mac_ctx, uint8_t session_id)
 {
 	uint8_t i;
 
@@ -73,7 +73,7 @@ uint8_t is_lim_session_off_channel(tpAniSirGlobal mac_ctx, uint8_t session_id)
  * Return: 1 - if channel switch is happening on any session.
  *         0 - if channel switch is not happening.
  **/
-uint8_t lim_is_chan_switch_running(tpAniSirGlobal mac_ctx)
+uint8_t lim_is_chan_switch_running(struct mac_context *mac_ctx)
 {
 	uint8_t i;
 
@@ -92,7 +92,7 @@ uint8_t lim_is_chan_switch_running(tpAniSirGlobal mac_ctx)
  * Return: true - if in MCC.
  *         false - Not in MCC
  **/
-uint8_t lim_is_in_mcc(tpAniSirGlobal mac_ctx)
+uint8_t lim_is_in_mcc(struct mac_context *mac_ctx)
 {
 	uint8_t i;
 	uint8_t chan = 0;
@@ -123,7 +123,7 @@ uint8_t lim_is_in_mcc(tpAniSirGlobal mac_ctx)
  *
  * Return: true - Number of stations active on all sessions.
  **/
-uint8_t pe_get_current_stas_count(tpAniSirGlobal mac_ctx)
+uint8_t pe_get_current_stas_count(struct mac_context *mac_ctx)
 {
 	uint8_t i;
 	uint8_t stacount = 0;

core/mac/src/pe/lim/lim_session_utils.h

@@ -19,9 +19,9 @@
 #if !defined(__LIM_SESSION_UTILS_H)
 #define __LIM_SESSION_UTILS_H
 
-uint8_t is_lim_session_off_channel(tpAniSirGlobal mac, uint8_t sessionId);
-uint8_t lim_is_chan_switch_running(tpAniSirGlobal mac);
-uint8_t lim_is_in_mcc(tpAniSirGlobal mac);
-uint8_t pe_get_current_stas_count(tpAniSirGlobal mac);
+uint8_t is_lim_session_off_channel(struct mac_context *mac, uint8_t sessionId);
+uint8_t lim_is_chan_switch_running(struct mac_context *mac);
+uint8_t lim_is_in_mcc(struct mac_context *mac);
+uint8_t pe_get_current_stas_count(struct mac_context *mac);
 
 #endif /* #if !defined( __LIM_SESSION_UTILS_H ) */

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

@@ -55,7 +55,7 @@
  *
  */
 static uint8_t
-lim_is_rsn_ie_valid_in_sme_req_message(tpAniSirGlobal mac_ctx,
+lim_is_rsn_ie_valid_in_sme_req_message(struct mac_context *mac_ctx,
 				       tpSirRSNie rsn_ie)
 {
 	uint8_t start = 0, privacy;
@@ -173,7 +173,7 @@ lim_is_rsn_ie_valid_in_sme_req_message(tpAniSirGlobal mac_ctx,
  */
 
 static uint8_t
-lim_is_addie_valid_in_sme_req_message(tpAniSirGlobal mac, tpSirAddie pAddie)
+lim_is_addie_valid_in_sme_req_message(struct mac_context *mac, tpSirAddie pAddie)
 {
 	int left = pAddie->length;
 	uint8_t *ptr = pAddie->addIEdata;
@@ -214,7 +214,7 @@ lim_is_addie_valid_in_sme_req_message(tpAniSirGlobal mac, tpSirAddie pAddie)
  * Return: true when RSN IE is valid, false otherwise
  */
 uint8_t
-lim_set_rs_nie_wp_aiefrom_sme_start_bss_req_message(tpAniSirGlobal mac_ctx,
+lim_set_rs_nie_wp_aiefrom_sme_start_bss_req_message(struct mac_context *mac_ctx,
 						    tpSirRSNie rsn_ie,
 						    struct pe_session *session)
 {
@@ -342,7 +342,7 @@ lim_set_rs_nie_wp_aiefrom_sme_start_bss_req_message(tpAniSirGlobal mac_ctx,
  */
 
 static uint8_t
-lim_is_bss_descr_valid_in_sme_req_message(tpAniSirGlobal mac,
+lim_is_bss_descr_valid_in_sme_req_message(struct mac_context *mac,
 					  tpSirBssDescription pBssDescr)
 {
 	uint8_t valid = true;
@@ -370,7 +370,7 @@ end:
  */
 
 uint8_t
-lim_is_sme_start_bss_req_valid(tpAniSirGlobal mac_ctx,
+lim_is_sme_start_bss_req_valid(struct mac_context *mac_ctx,
 			       tpSirSmeStartBssReq start_bss_req)
 {
 	uint8_t i = 0;
@@ -488,7 +488,7 @@ lim_is_sme_start_bss_req_valid(tpAniSirGlobal mac_ctx,
  *         false otherwise
  */
 
-uint8_t lim_is_sme_join_req_valid(tpAniSirGlobal mac, tpSirSmeJoinReq pJoinReq)
+uint8_t lim_is_sme_join_req_valid(struct mac_context *mac, tpSirSmeJoinReq pJoinReq)
 {
 	uint8_t valid = true;
 
@@ -565,7 +565,7 @@ end:
  */
 
 uint8_t
-lim_is_sme_disassoc_req_valid(tpAniSirGlobal mac,
+lim_is_sme_disassoc_req_valid(struct mac_context *mac,
 			      tpSirSmeDisassocReq pDisassocReq,
 			      struct pe_session *pe_session)
 {
@@ -598,7 +598,7 @@ lim_is_sme_disassoc_req_valid(tpAniSirGlobal mac,
  */
 
 uint8_t
-lim_is_sme_disassoc_cnf_valid(tpAniSirGlobal mac,
+lim_is_sme_disassoc_cnf_valid(struct mac_context *mac,
 			      tpSirSmeDisassocCnf pDisassocCnf,
 			      struct pe_session *pe_session)
 {
@@ -629,7 +629,7 @@ lim_is_sme_disassoc_cnf_valid(tpAniSirGlobal mac,
  */
 
 uint8_t
-lim_is_sme_deauth_req_valid(tpAniSirGlobal mac, tpSirSmeDeauthReq pDeauthReq,
+lim_is_sme_deauth_req_valid(struct mac_context *mac, tpSirSmeDeauthReq pDeauthReq,
 			    struct pe_session *pe_session)
 {
 	if (qdf_is_macaddr_group(&pDeauthReq->peer_macaddr) &&
@@ -659,7 +659,7 @@ lim_is_sme_deauth_req_valid(tpAniSirGlobal mac, tpSirSmeDeauthReq pDeauthReq,
  */
 
 uint8_t
-lim_is_sme_set_context_req_valid(tpAniSirGlobal mac,
+lim_is_sme_set_context_req_valid(struct mac_context *mac,
 				 tpSirSmeSetContextReq pSetContextReq)
 {
 	uint8_t i = 0;

core/mac/src/pe/lim/lim_sme_req_utils.h

@@ -33,17 +33,17 @@
 #include "lim_types.h"
 
 /* LIM SME request messages related utility functions */
-uint8_t lim_is_sme_start_bss_req_valid(tpAniSirGlobal, tpSirSmeStartBssReq);
-uint8_t lim_set_rs_nie_wp_aiefrom_sme_start_bss_req_message(tpAniSirGlobal,
+uint8_t lim_is_sme_start_bss_req_valid(struct mac_context *, tpSirSmeStartBssReq);
+uint8_t lim_set_rs_nie_wp_aiefrom_sme_start_bss_req_message(struct mac_context *,
 							    tpSirRSNie, struct pe_session *);
-uint8_t lim_is_sme_join_req_valid(tpAniSirGlobal, tpSirSmeJoinReq);
-uint8_t lim_is_sme_disassoc_req_valid(tpAniSirGlobal, tpSirSmeDisassocReq,
+uint8_t lim_is_sme_join_req_valid(struct mac_context *, tpSirSmeJoinReq);
+uint8_t lim_is_sme_disassoc_req_valid(struct mac_context *, tpSirSmeDisassocReq,
 				      struct pe_session *);
-uint8_t lim_is_sme_deauth_req_valid(tpAniSirGlobal, tpSirSmeDeauthReq, struct pe_session *);
-uint8_t lim_is_sme_set_context_req_valid(tpAniSirGlobal, tpSirSmeSetContextReq);
+uint8_t lim_is_sme_deauth_req_valid(struct mac_context *, tpSirSmeDeauthReq, struct pe_session *);
+uint8_t lim_is_sme_set_context_req_valid(struct mac_context *, tpSirSmeSetContextReq);
 uint8_t lim_is_sme_stop_bss_req_valid(uint32_t *);
 uint8_t *lim_get_bss_id_from_sme_join_req_msg(uint8_t *);
-uint8_t lim_is_sme_disassoc_cnf_valid(tpAniSirGlobal, tpSirSmeDisassocCnf,
+uint8_t lim_is_sme_disassoc_cnf_valid(struct mac_context *, tpSirSmeDisassocCnf,
 				      struct pe_session *);
 
 #endif /* __LIM_SME_REQ_UTILS_H */

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

@@ -51,7 +51,7 @@
  * @return success if GET operation is ok, else Failure.
  */
 
-QDF_STATUS lim_get_sta_hash_bssidx(tpAniSirGlobal mac, uint16_t assocId,
+QDF_STATUS lim_get_sta_hash_bssidx(struct mac_context *mac, uint16_t assocId,
 				      uint8_t *bssidx, struct pe_session *pe_session)
 {
 	tpDphHashNode pSta =

core/mac/src/pe/lim/lim_sta_hash_api.h

@@ -35,7 +35,7 @@
 #include "ani_global.h"
 #include "lim_types.h"
 
-QDF_STATUS lim_get_sta_hash_bssidx(tpAniSirGlobal mac, uint16_t assocId,
+QDF_STATUS lim_get_sta_hash_bssidx(struct mac_context *mac, uint16_t assocId,
 				      uint8_t *bssidx, struct pe_session *pe_session);
 
 #endif

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

@@ -57,7 +57,7 @@
    convert  ACTIVE DFS channel to DFS channels */
 #define ACTIVE_TO_PASSIVE_CONVERISON_TIMEOUT     1000
 
-static bool lim_create_non_ap_timers(tpAniSirGlobal mac)
+static bool lim_create_non_ap_timers(struct mac_context *mac)
 {
 	uint32_t cfgValue;
 	/* Create Channel Switch Timer */
@@ -181,7 +181,7 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal mac)
  * @return : status of operation
  */
 
-uint32_t lim_create_timers(tpAniSirGlobal mac)
+uint32_t lim_create_timers(struct mac_context *mac)
 {
 	uint32_t cfgValue, i = 0;
 
@@ -332,7 +332,7 @@ void lim_timer_handler(void *pMacGlobal, uint32_t param)
 {
 	QDF_STATUS status;
 	struct scheduler_msg msg = {0};
-	tpAniSirGlobal mac = (tpAniSirGlobal) pMacGlobal;
+	struct mac_context *mac = (struct mac_context *) pMacGlobal;
 
 	/* Prepare and post message to LIM Message Queue */
 
@@ -370,7 +370,7 @@ void lim_timer_handler(void *pMacGlobal, uint32_t param)
 void lim_addts_response_timer_handler(void *pMacGlobal, uint32_t param)
 {
 	struct scheduler_msg msg = {0};
-	tpAniSirGlobal mac = (tpAniSirGlobal) pMacGlobal;
+	struct mac_context *mac = (struct mac_context *) pMacGlobal;
 
 	/* Prepare and post message to LIM Message Queue */
 
@@ -405,7 +405,7 @@ void lim_addts_response_timer_handler(void *pMacGlobal, uint32_t param)
 void lim_auth_response_timer_handler(void *pMacGlobal, uint32_t param)
 {
 	struct scheduler_msg msg = {0};
-	tpAniSirGlobal mac = (tpAniSirGlobal) pMacGlobal;
+	struct mac_context *mac = (struct mac_context *) pMacGlobal;
 
 	/* Prepare and post message to LIM Message Queue */
 
@@ -431,7 +431,7 @@ void lim_auth_response_timer_handler(void *pMacGlobal, uint32_t param)
 void lim_assoc_failure_timer_handler(void *mac_global, uint32_t param)
 {
 	struct scheduler_msg msg = {0};
-	tpAniSirGlobal mac_ctx = (tpAniSirGlobal) mac_global;
+	struct mac_context *mac_ctx = (struct mac_context *) mac_global;
 	struct pe_session *session = NULL;
 
 	session = mac_ctx->lim.pe_session;
@@ -486,7 +486,7 @@ void lim_assoc_failure_timer_handler(void *mac_global, uint32_t param)
 void lim_update_olbc_cache_timer_handler(void *pMacGlobal, uint32_t param)
 {
 	struct scheduler_msg msg = {0};
-	tpAniSirGlobal mac = (tpAniSirGlobal) pMacGlobal;
+	struct mac_context *mac = (struct mac_context *) pMacGlobal;
 
 	/* Prepare and post message to LIM Message Queue */
 
@@ -519,7 +519,7 @@ void lim_update_olbc_cache_timer_handler(void *pMacGlobal, uint32_t param)
  * @return None
  */
 
-void lim_deactivate_and_change_timer(tpAniSirGlobal mac, uint32_t timerId)
+void lim_deactivate_and_change_timer(struct mac_context *mac, uint32_t timerId)
 {
 	uint32_t val = 0;
 	struct pe_session * session_entry;
@@ -799,7 +799,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal mac, uint32_t timerId)
  */
 
 void
-lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal mac, uint32_t timerId,
+lim_deactivate_and_change_per_sta_id_timer(struct mac_context *mac, uint32_t timerId,
 					   uint16_t staId)
 {
 	uint32_t val;
@@ -888,7 +888,7 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal mac, uint32_t timerId,
  * @return None
  */
 
-void lim_activate_cnf_timer(tpAniSirGlobal mac, uint16_t staId,
+void lim_activate_cnf_timer(struct mac_context *mac, uint16_t staId,
 			    struct pe_session *pe_session)
 {
 	mac->lim.limTimers.gpLimCnfWaitTimer[staId].sessionId =
@@ -919,7 +919,7 @@ void lim_activate_cnf_timer(tpAniSirGlobal mac, uint16_t staId,
  * @return None
  */
 
-void lim_activate_auth_rsp_timer(tpAniSirGlobal mac, tLimPreAuthNode *pAuthNode)
+void lim_activate_auth_rsp_timer(struct mac_context *mac, tLimPreAuthNode *pAuthNode)
 {
 	if (tx_timer_activate(&pAuthNode->timer) != TX_SUCCESS) {
 		/* / Could not activate auth rsp timer. */
@@ -950,7 +950,7 @@ void lim_cnf_wait_tmer_handler(void *pMacGlobal, uint32_t param)
 {
 	struct scheduler_msg msg = {0};
 	uint32_t statusCode;
-	tpAniSirGlobal mac = (tpAniSirGlobal) pMacGlobal;
+	struct mac_context *mac = (struct mac_context *) pMacGlobal;
 
 	msg.type = SIR_LIM_CNF_WAIT_TIMEOUT;
 	msg.bodyval = (uint32_t) param;
@@ -965,7 +965,7 @@ void lim_cnf_wait_tmer_handler(void *pMacGlobal, uint32_t param)
 void lim_channel_switch_timer_handler(void *pMacGlobal, uint32_t param)
 {
 	struct scheduler_msg msg = {0};
-	tpAniSirGlobal mac = (tpAniSirGlobal) pMacGlobal;
+	struct mac_context *mac = (struct mac_context *) pMacGlobal;
 
 	pe_debug("ChannelSwitch Timer expired.  Posting msg to LIM");
 

core/mac/src/pe/lim/lim_timer_utils.h

@@ -63,18 +63,18 @@ enum {
 #define LIM_DISASSOC_DEAUTH_ACK_TIMEOUT         500
 
 /* Timer Handler functions */
-uint32_t lim_create_timers(tpAniSirGlobal);
+uint32_t lim_create_timers(struct mac_context *);
 void lim_timer_handler(void *, uint32_t);
 void lim_auth_response_timer_handler(void *, uint32_t);
 void lim_assoc_failure_timer_handler(void *, uint32_t);
 void limReassocFailureTimerHandler(void *, uint32_t);
 
-void lim_deactivate_and_change_timer(tpAniSirGlobal, uint32_t);
+void lim_deactivate_and_change_timer(struct mac_context *, uint32_t);
 void limDummyPktExpTimerHandler(void *, uint32_t);
 void lim_cnf_wait_tmer_handler(void *, uint32_t);
-void lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal, uint32_t, uint16_t);
-void lim_activate_cnf_timer(tpAniSirGlobal, uint16_t, struct pe_session *);
-void lim_activate_auth_rsp_timer(tpAniSirGlobal, tLimPreAuthNode *);
+void lim_deactivate_and_change_per_sta_id_timer(struct mac_context *, uint32_t, uint16_t);
+void lim_activate_cnf_timer(struct mac_context *, uint16_t, struct pe_session *);
+void lim_activate_auth_rsp_timer(struct mac_context *, tLimPreAuthNode *);
 void lim_update_olbc_cache_timer_handler(void *, uint32_t);
 void lim_addts_response_timer_handler(void *, uint32_t);
 void lim_channel_switch_timer_handler(void *, uint32_t);

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

@@ -30,7 +30,7 @@
    Include Files
    ------------------------------------------------------------------------*/
 
-#include "ani_global.h"          /* for tpAniSirGlobal */
+#include "ani_global.h"          /* for struct mac_context **/
 
 #include "lim_trace.h"
 #include "lim_timer_utils.h"
@@ -91,7 +91,7 @@ static uint8_t *__lim_trace_get_mgmt_drop_reason_string(uint16_t dropReason)
 	}
 }
 
-void lim_trace_init(tpAniSirGlobal mac)
+void lim_trace_init(struct mac_context *mac)
 {
 	qdf_trace_register(QDF_MODULE_ID_PE, &lim_trace_dump);
 }
@@ -272,7 +272,7 @@ void lim_trace_dump(void *mac, tp_qdf_trace_record pRecord,
 	}
 }
 
-void mac_trace_msg_tx(tpAniSirGlobal mac, uint8_t session, uint32_t data)
+void mac_trace_msg_tx(struct mac_context *mac, uint8_t session, uint32_t data)
 {
 
 	uint16_t msgId = (uint16_t) MAC_TRACE_GET_MSG_ID(data);
@@ -297,7 +297,7 @@ void mac_trace_msg_tx(tpAniSirGlobal mac, uint8_t session, uint32_t data)
 	}
 }
 
-void mac_trace_msg_tx_new(tpAniSirGlobal mac, uint8_t module, uint8_t session,
+void mac_trace_msg_tx_new(struct mac_context *mac, uint8_t module, uint8_t session,
 			  uint32_t data)
 {
 	uint16_t msgId = (uint16_t) MAC_TRACE_GET_MSG_ID(data);
@@ -328,7 +328,7 @@ void mac_trace_msg_tx_new(tpAniSirGlobal mac, uint8_t module, uint8_t session,
  * bit31: Rx message deferred or not
  * bit 0-15: message ID:
  */
-void mac_trace_msg_rx(tpAniSirGlobal mac, uint8_t session, uint32_t data)
+void mac_trace_msg_rx(struct mac_context *mac, uint8_t session, uint32_t data)
 {
 	uint16_t msgId = (uint16_t) MAC_TRACE_GET_MSG_ID(data);
 	uint8_t module_id = (uint8_t) MAC_TRACE_GET_MODULE_ID(data);
@@ -356,7 +356,7 @@ void mac_trace_msg_rx(tpAniSirGlobal mac, uint8_t session, uint32_t data)
  * bit31: Rx message deferred or not
  * bit 0-15: message ID:
  */
-void mac_trace_msg_rx_new(tpAniSirGlobal mac, uint8_t module, uint8_t session,
+void mac_trace_msg_rx_new(struct mac_context *mac, uint8_t module, uint8_t session,
 			  uint32_t data)
 {
 	uint16_t msgId = (uint16_t) MAC_TRACE_GET_MSG_ID(data);