qcacld-3.0: Replace tpAniSirGlobal in SME CSR

To align with the Linux coding style replace tpAniSirGlobal with
struct mac_context * in:
csr_api.h
csr_api_roam.c
csr_api_scan.c
csr_cmd_process.c
csr_host_scan_roam.c
csr_inside_api.h
csr_internal.h
csr_neighbor_roam.c
csr_neighbor_roam.h
csr_roam_preauth.c
csr_support.h
csr_util.c

Change-Id: I38a4602d5e31c818e81df2a9de8073667087f44a
CRs-Fixed: 2360292

core/sme/inc/csr_api.h

@@ -1543,7 +1543,7 @@ typedef QDF_STATUS (*csr_session_close_cb)(uint8_t session_id);
 #define CSR_IS_AUTH_TYPE_SAE(auth_type) (false)
 #endif
 
-QDF_STATUS csr_set_channels(tpAniSirGlobal mac, tCsrConfigParam *pParam);
+QDF_STATUS csr_set_channels(struct mac_context *mac, tCsrConfigParam *pParam);
 
 /* enum to string conversion for debug output */
 const char *get_e_roam_cmd_status_str(eRoamCmdStatus val);
@@ -1567,12 +1567,12 @@ typedef void (*tCsrSnrCallback)(int8_t snr, uint32_t staId, void *pContext);
  * Return: Success or Failure
  */
 #ifdef WLAN_FEATURE_HOST_ROAM
-QDF_STATUS csr_roam_issue_ft_preauth_req(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_roam_issue_ft_preauth_req(struct mac_context *mac_ctx,
 					 uint32_t session_id,
 					 tpSirBssDescription bss_desc);
 #else
 static inline
-QDF_STATUS csr_roam_issue_ft_preauth_req(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_roam_issue_ft_preauth_req(struct mac_context *mac_ctx,
 					 uint32_t session_id,
 					 tpSirBssDescription bss_desc)
 {
@@ -1586,11 +1586,11 @@ typedef void (*csr_readyToExtWoWCallback)(void *pContext, bool status);
 #endif
 typedef void (*csr_link_status_callback)(uint8_t status, void *context);
 #ifdef FEATURE_WLAN_TDLS
-void csr_roam_fill_tdls_info(tpAniSirGlobal mac_ctx,
+void csr_roam_fill_tdls_info(struct mac_context *mac_ctx,
 			     struct csr_roam_info *roam_info,
 			     tpSirSmeJoinRsp join_rsp);
 #else
-static inline void csr_roam_fill_tdls_info(tpAniSirGlobal mac_ctx,
+static inline void csr_roam_fill_tdls_info(struct mac_context *mac_ctx,
 					   struct csr_roam_info *roam_info,
 					   tpSirSmeJoinRsp join_rsp)
 {}
@@ -1614,7 +1614,7 @@ void csr_packetdump_timer_stop(void);
  * Return: chan status info
  */
 struct lim_channel_status *
-csr_get_channel_status(tpAniSirGlobal mac, uint32_t channel_id);
+csr_get_channel_status(struct mac_context *mac, uint32_t channel_id);
 
 /**
  * csr_clear_channel_status() - clear chan info
@@ -1622,5 +1622,5 @@ csr_get_channel_status(tpAniSirGlobal mac, uint32_t channel_id);
  *
  * Return: none
  */
-void csr_clear_channel_status(tpAniSirGlobal mac);
+void csr_clear_channel_status(struct mac_context *mac);
 #endif

core/sme/inc/csr_internal.h

@@ -588,7 +588,7 @@ struct csr_pestats_reqinfo {
 	bool rspPending;
 	uint8_t staId;
 	uint8_t numClient;
-	tpAniSirGlobal mac;
+	struct mac_context *mac;
 	uint8_t sessionId;
 };
 
@@ -602,7 +602,7 @@ struct csr_statsclient_reqinfo {
 	uint8_t staId;
 	qdf_mc_timer_t timer;
 	bool timerExpired;
-	tpAniSirGlobal mac;    /* TODO: Confirm this change BTAMP */
+	struct mac_context *mac;    /* TODO: Confirm this change BTAMP */
 	uint8_t sessionId;
 };
 
@@ -1014,42 +1014,42 @@ struct csr_roamstruct {
 #define CSR_GET_SUBNET_STATUS(roam_reason) (0)
 #endif
 
-QDF_STATUS csr_get_channel_and_power_list(tpAniSirGlobal mac);
+QDF_STATUS csr_get_channel_and_power_list(struct mac_context *mac);
 
-QDF_STATUS csr_scan_filter_results(tpAniSirGlobal mac);
+QDF_STATUS csr_scan_filter_results(struct mac_context *mac);
 
-QDF_STATUS csr_set_modify_profile_fields(tpAniSirGlobal mac,
+QDF_STATUS csr_set_modify_profile_fields(struct mac_context *mac,
 		uint32_t sessionId, tCsrRoamModifyProfileFields *
 		pModifyProfileFields);
-QDF_STATUS csr_get_modify_profile_fields(tpAniSirGlobal mac,
+QDF_STATUS csr_get_modify_profile_fields(struct mac_context *mac,
 		uint32_t sessionId, tCsrRoamModifyProfileFields *
 		pModifyProfileFields);
-void csr_set_global_cfgs(tpAniSirGlobal mac);
-void csr_set_default_dot11_mode(tpAniSirGlobal mac);
-bool csr_is_conn_state_disconnected(tpAniSirGlobal mac,
+void csr_set_global_cfgs(struct mac_context *mac);
+void csr_set_default_dot11_mode(struct mac_context *mac);
+bool csr_is_conn_state_disconnected(struct mac_context *mac,
 						   uint32_t sessionId);
-bool csr_is_conn_state_connected_ibss(tpAniSirGlobal mac,
+bool csr_is_conn_state_connected_ibss(struct mac_context *mac,
 						      uint32_t sessionId);
-bool csr_is_conn_state_disconnected_ibss(tpAniSirGlobal mac,
+bool csr_is_conn_state_disconnected_ibss(struct mac_context *mac,
 							   uint32_t sessionId);
-bool csr_is_conn_state_connected_infra(tpAniSirGlobal mac,
+bool csr_is_conn_state_connected_infra(struct mac_context *mac,
 							uint32_t sessionId);
-bool csr_is_conn_state_connected(tpAniSirGlobal mac,
+bool csr_is_conn_state_connected(struct mac_context *mac,
 					       uint32_t sessionId);
-bool csr_is_conn_state_infra(tpAniSirGlobal mac,
+bool csr_is_conn_state_infra(struct mac_context *mac,
 					uint32_t sessionId);
-bool csr_is_conn_state_ibss(tpAniSirGlobal mac, uint32_t sessionId);
-bool csr_is_conn_state_wds(tpAniSirGlobal mac, uint32_t sessionId);
-bool csr_is_conn_state_connected_wds(tpAniSirGlobal mac,
+bool csr_is_conn_state_ibss(struct mac_context *mac, uint32_t sessionId);
+bool csr_is_conn_state_wds(struct mac_context *mac, uint32_t sessionId);
+bool csr_is_conn_state_connected_wds(struct mac_context *mac,
 						    uint32_t sessionId);
-bool csr_is_conn_state_disconnected_wds(tpAniSirGlobal mac,
+bool csr_is_conn_state_disconnected_wds(struct mac_context *mac,
 		uint32_t sessionId);
-bool csr_is_any_session_in_connect_state(tpAniSirGlobal mac);
-bool csr_is_all_session_disconnected(tpAniSirGlobal mac);
-bool csr_is_sta_session_connected(tpAniSirGlobal mac);
-bool csr_is_p2p_session_connected(tpAniSirGlobal mac);
-bool csr_is_any_session_connected(tpAniSirGlobal mac);
-bool csr_is_infra_connected(tpAniSirGlobal mac);
+bool csr_is_any_session_in_connect_state(struct mac_context *mac);
+bool csr_is_all_session_disconnected(struct mac_context *mac);
+bool csr_is_sta_session_connected(struct mac_context *mac);
+bool csr_is_p2p_session_connected(struct mac_context *mac);
+bool csr_is_any_session_connected(struct mac_context *mac);
+bool csr_is_infra_connected(struct mac_context *mac);
 
 /**
  * csr_get_connected_infra() - get the session id of the connected infra
@@ -1061,78 +1061,78 @@ bool csr_is_infra_connected(tpAniSirGlobal mac);
  *
  * Return: session id of the connected infra
  */
-uint8_t csr_get_connected_infra(tpAniSirGlobal mac_ctx);
-bool csr_is_concurrent_infra_connected(tpAniSirGlobal mac);
-bool csr_is_concurrent_session_running(tpAniSirGlobal mac);
-bool csr_is_infra_ap_started(tpAniSirGlobal mac);
-bool csr_is_ibss_started(tpAniSirGlobal mac);
-bool csr_is_valid_mc_concurrent_session(tpAniSirGlobal mac,
+uint8_t csr_get_connected_infra(struct mac_context *mac_ctx);
+bool csr_is_concurrent_infra_connected(struct mac_context *mac);
+bool csr_is_concurrent_session_running(struct mac_context *mac);
+bool csr_is_infra_ap_started(struct mac_context *mac);
+bool csr_is_ibss_started(struct mac_context *mac);
+bool csr_is_valid_mc_concurrent_session(struct mac_context *mac,
 							 uint32_t sessionId,
 						tSirBssDescription *pBssDesc);
-bool csr_is_conn_state_connected_infra_ap(tpAniSirGlobal mac,
+bool csr_is_conn_state_connected_infra_ap(struct mac_context *mac,
 		uint32_t sessionId);
-QDF_STATUS csr_get_statistics(tpAniSirGlobal mac,
+QDF_STATUS csr_get_statistics(struct mac_context *mac,
 		eCsrStatsRequesterType requesterId,
 		uint32_t statsMask, tCsrStatsCallback callback,
 		uint8_t staId, void *pContext, uint8_t sessionId);
-QDF_STATUS csr_get_rssi(tpAniSirGlobal mac, tCsrRssiCallback callback,
+QDF_STATUS csr_get_rssi(struct mac_context *mac, tCsrRssiCallback callback,
 		uint8_t staId, struct qdf_mac_addr bssId, int8_t lastRSSI,
 		void *pContext);
-QDF_STATUS csr_get_snr(tpAniSirGlobal mac, tCsrSnrCallback callback,
+QDF_STATUS csr_get_snr(struct mac_context *mac, tCsrSnrCallback callback,
 		uint8_t staId, struct qdf_mac_addr bssId, void *pContext);
-QDF_STATUS csr_get_config_param(tpAniSirGlobal mac,
+QDF_STATUS csr_get_config_param(struct mac_context *mac,
 					  tCsrConfigParam *pParam);
-QDF_STATUS csr_change_default_config_param(tpAniSirGlobal mac,
+QDF_STATUS csr_change_default_config_param(struct mac_context *mac,
 		tCsrConfigParam *pParam);
-QDF_STATUS csr_msg_processor(tpAniSirGlobal mac, void *pMsgBuf);
-QDF_STATUS csr_open(tpAniSirGlobal mac);
-QDF_STATUS csr_init_chan_list(tpAniSirGlobal mac, uint8_t *alpha2);
-QDF_STATUS csr_close(tpAniSirGlobal mac);
-QDF_STATUS csr_start(tpAniSirGlobal mac);
-QDF_STATUS csr_stop(tpAniSirGlobal mac);
-QDF_STATUS csr_ready(tpAniSirGlobal mac);
+QDF_STATUS csr_msg_processor(struct mac_context *mac, void *pMsgBuf);
+QDF_STATUS csr_open(struct mac_context *mac);
+QDF_STATUS csr_init_chan_list(struct mac_context *mac, uint8_t *alpha2);
+QDF_STATUS csr_close(struct mac_context *mac);
+QDF_STATUS csr_start(struct mac_context *mac);
+QDF_STATUS csr_stop(struct mac_context *mac);
+QDF_STATUS csr_ready(struct mac_context *mac);
 
 #ifdef FEATURE_WLAN_WAPI
-QDF_STATUS csr_roam_get_wapi_req_ie(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_get_wapi_req_ie(struct mac_context *mac,
 		uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf);
-QDF_STATUS csr_roam_get_wapi_rsp_ie(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_get_wapi_rsp_ie(struct mac_context *mac,
 						uint32_t sessionId,
 		uint32_t *pLen, uint8_t *pBuf);
-uint8_t csr_construct_wapi_ie(tpAniSirGlobal mac, uint32_t sessionId,
+uint8_t csr_construct_wapi_ie(struct mac_context *mac, uint32_t sessionId,
 		struct csr_roam_profile *pProfile,
 		tSirBssDescription *pSirBssDesc,
 		tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe);
 #endif /* FEATURE_WLAN_WAPI */
 
-void csr_set_cfg_privacy(tpAniSirGlobal mac,
+void csr_set_cfg_privacy(struct mac_context *mac,
 			 struct csr_roam_profile *pProfile,
 			 bool fPrivacy);
-int8_t csr_get_infra_session_id(tpAniSirGlobal mac);
-uint8_t csr_get_infra_operation_channel(tpAniSirGlobal mac,
+int8_t csr_get_infra_session_id(struct mac_context *mac);
+uint8_t csr_get_infra_operation_channel(struct mac_context *mac,
 							uint8_t sessionId);
-bool csr_is_session_client_and_connected(tpAniSirGlobal mac,
+bool csr_is_session_client_and_connected(struct mac_context *mac,
 		uint8_t sessionId);
 uint8_t csr_get_concurrent_operation_channel(
-	tpAniSirGlobal mac);
+	struct mac_context *mac);
 
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
 uint16_t csr_check_concurrent_channel_overlap(
-		tpAniSirGlobal mac,
+		struct mac_context *mac,
 		uint16_t sap_ch, eCsrPhyMode sap_phymode,
 		uint8_t cc_switch_mode);
 #endif
-QDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_copy_connect_profile(struct mac_context *mac,
 		uint32_t sessionId, tCsrRoamConnectedProfile *pProfile);
-bool csr_is_set_key_allowed(tpAniSirGlobal mac, uint32_t sessionId);
+bool csr_is_set_key_allowed(struct mac_context *mac, uint32_t sessionId);
 
 /* Returns whether the current association is a 11r assoc or not */
-bool csr_roam_is11r_assoc(tpAniSirGlobal mac, uint8_t sessionId);
+bool csr_roam_is11r_assoc(struct mac_context *mac, uint8_t sessionId);
 
 #ifdef FEATURE_WLAN_ESE
 /* Returns whether the current association is a ESE assoc or not */
-bool csr_roam_is_ese_assoc(tpAniSirGlobal mac, uint32_t sessionId);
-bool csr_roam_is_ese_ini_feature_enabled(tpAniSirGlobal mac);
-QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal mac,
+bool csr_roam_is_ese_assoc(struct mac_context *mac, uint32_t sessionId);
+bool csr_roam_is_ese_ini_feature_enabled(struct mac_context *mac);
+QDF_STATUS csr_get_tsm_stats(struct mac_context *mac,
 		tCsrTsmStatsCallback callback,
 		uint8_t staId,
 		struct qdf_mac_addr bssId,
@@ -1140,10 +1140,10 @@ QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal mac,
 #endif
 
 /* Returns whether "Legacy Fast Roaming" is enabled...or not */
-bool csr_roam_is_fast_roam_enabled(tpAniSirGlobal mac,
+bool csr_roam_is_fast_roam_enabled(struct mac_context *mac,
 						uint32_t sessionId);
 bool csr_roam_is_roam_offload_scan_enabled(
-	tpAniSirGlobal mac);
+	struct mac_context *mac);
 bool csr_is_channel_present_in_list(uint8_t *pChannelList,
 						   int numChannels,
 						   uint8_t channel);
@@ -1151,73 +1151,73 @@ QDF_STATUS csr_add_to_channel_list_front(uint8_t *pChannelList,
 							int numChannels,
 		uint8_t channel);
 #if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD)
-QDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_offload_scan_rsp_hdlr(struct mac_context *mac,
 		tpSirRoamOffloadScanRsp scanOffloadRsp);
 #else
 static inline QDF_STATUS csr_roam_offload_scan_rsp_hdlr(
-		tpAniSirGlobal mac,
+		struct mac_context *mac,
 		tpSirRoamOffloadScanRsp scanOffloadRsp)
 {
 	return QDF_STATUS_E_NOSUPPORT;
 }
 #endif
-QDF_STATUS csr_handoff_request(tpAniSirGlobal mac, uint8_t sessionId,
+QDF_STATUS csr_handoff_request(struct mac_context *mac, uint8_t sessionId,
 		tCsrHandoffRequest
 		*pHandoffInfo);
-bool csr_roam_is_sta_mode(tpAniSirGlobal mac, uint32_t sessionId);
+bool csr_roam_is_sta_mode(struct mac_context *mac, uint32_t sessionId);
 
 /* Post Channel Change Indication */
-QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_channel_change_req(struct mac_context *mac,
 					struct qdf_mac_addr
 				       bssid, struct ch_params *ch_params,
 				       struct csr_roam_profile *profile);
 
 /* Post Beacon Tx Start Indication */
-QDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_start_beacon_req(struct mac_context *mac,
 		struct qdf_mac_addr bssid, uint8_t dfsCacWaitStatus);
 
-QDF_STATUS csr_roam_send_chan_sw_ie_request(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_send_chan_sw_ie_request(struct mac_context *mac,
 					    struct qdf_mac_addr bssid,
 					    uint8_t targetChannel,
 					    uint8_t csaIeReqd,
 					    struct ch_params *ch_params);
-QDF_STATUS csr_roam_modify_add_ies(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_modify_add_ies(struct mac_context *mac,
 					tSirModifyIE *pModifyIE,
 				   eUpdateIEsType updateType);
 QDF_STATUS
-csr_roam_update_add_ies(tpAniSirGlobal mac,
+csr_roam_update_add_ies(struct mac_context *mac,
 		tSirUpdateIE *pUpdateIE, eUpdateIEsType updateType);
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(
-		tpAniSirGlobal mac,
+		struct mac_context *mac,
 		struct sSirSmeRoamOffloadSynchInd *roam_synch_ind_ptr,
 		tpSirBssDescription  bss_desc_ptr);
-void csr_process_ho_fail_ind(tpAniSirGlobal mac, void *pMsgBuf);
+void csr_process_ho_fail_ind(struct mac_context *mac, void *pMsgBuf);
 #endif
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
-void csr_roaming_report_diag_event(tpAniSirGlobal mac_ctx,
+void csr_roaming_report_diag_event(struct mac_context *mac_ctx,
 		roam_offload_synch_ind *roam_synch_ind_ptr,
 		enum csr_diagwlan_status_eventreason reason);
 #else
 static inline void csr_roaming_report_diag_event(
-		tpAniSirGlobal mac_ctx,
+		struct mac_context *mac_ctx,
 		roam_offload_synch_ind *roam_synch_ind_ptr,
 		enum csr_diagwlan_status_eventreason reason)
 {}
 #endif
 
-bool csr_store_joinreq_param(tpAniSirGlobal mac_ctx,
+bool csr_store_joinreq_param(struct mac_context *mac_ctx,
 		struct csr_roam_profile *profile,
 		tScanResultHandle scan_cache,
 		uint32_t *roam_id,
 		uint32_t session_id);
-bool csr_find_session_by_bssid(tpAniSirGlobal mac_ctx, uint8_t *bssid);
-bool csr_clear_joinreq_param(tpAniSirGlobal mac_ctx,
+bool csr_find_session_by_bssid(struct mac_context *mac_ctx, uint8_t *bssid);
+bool csr_clear_joinreq_param(struct mac_context *mac_ctx,
 		uint32_t session_id);
-QDF_STATUS csr_issue_stored_joinreq(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_issue_stored_joinreq(struct mac_context *mac_ctx,
 		uint32_t *roam_id,
 		uint32_t session_id);
-QDF_STATUS csr_get_channels_and_power(tpAniSirGlobal mac);
+QDF_STATUS csr_get_channels_and_power(struct mac_context *mac);
 
 void csr_nonscan_pending_ll_unlock(struct mac_context *mac_ctx);
 void csr_nonscan_active_ll_unlock(struct mac_context *mac_ctx);
@@ -1303,24 +1303,24 @@ void csr_purge_vdev_all_scan_ser_cmd_list(struct mac_context *mac_ctx,
  */
 void csr_purge_pdev_all_ser_cmd_list(struct mac_context *mac_ctx);
 
-bool csr_wait_for_connection_update(tpAniSirGlobal mac,
+bool csr_wait_for_connection_update(struct mac_context *mac,
 		bool do_release_reacquire_lock);
-enum QDF_OPMODE csr_get_session_persona(tpAniSirGlobal pmac,
+enum QDF_OPMODE csr_get_session_persona(struct mac_context *pmac,
 					uint32_t session_id);
 void csr_roam_substate_change(
-			tpAniSirGlobal mac, enum csr_roam_substate
+			struct mac_context *mac, enum csr_roam_substate
 					NewSubstate, uint32_t sessionId);
 
 void csr_neighbor_roam_process_scan_results(
-		tpAniSirGlobal mac_ctx,
+		struct mac_context *mac_ctx,
 		uint8_t sessionid, tScanResultHandle *scan_results_list);
 
-void csr_neighbor_roam_trigger_handoff(tpAniSirGlobal mac_ctx,
+void csr_neighbor_roam_trigger_handoff(struct mac_context *mac_ctx,
 					uint8_t session_id);
-bool csr_is_ndi_started(tpAniSirGlobal mac_ctx, uint32_t session_id);
+bool csr_is_ndi_started(struct mac_context *mac_ctx, uint32_t session_id);
 
 QDF_STATUS csr_roam_update_config(
-			tpAniSirGlobal mac_ctx, uint8_t session_id,
+			struct mac_context *mac_ctx, uint8_t session_id,
 				  uint16_t capab, uint32_t value);
 
 /**
@@ -1330,5 +1330,5 @@ QDF_STATUS csr_roam_update_config(
  *
  * Return : true if channel causes MCC, else false
  */
-bool csr_is_mcc_channel(tpAniSirGlobal mac_ctx, uint8_t channel);
+bool csr_is_mcc_channel(struct mac_context *mac_ctx, uint8_t channel);
 #endif

core/sme/inc/csr_neighbor_roam.h

@@ -166,115 +166,115 @@ typedef struct sCsrNeighborRoamControlInfo {
 } tCsrNeighborRoamControlInfo, *tpCsrNeighborRoamControlInfo;
 
 /* All the necessary Function declarations are here */
-QDF_STATUS csr_neighbor_roam_indicate_connect(tpAniSirGlobal mac,
+QDF_STATUS csr_neighbor_roam_indicate_connect(struct mac_context *mac,
 		uint8_t sessionId, QDF_STATUS status);
-QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal mac,
+QDF_STATUS csr_neighbor_roam_indicate_disconnect(struct mac_context *mac,
 		uint8_t sessionId);
-QDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal mac, uint8_t sessionId);
-void csr_neighbor_roam_close(tpAniSirGlobal mac, uint8_t sessionId);
-QDF_STATUS csr_neighbor_roam_transit_to_cfg_chan_scan(tpAniSirGlobal mac,
+QDF_STATUS csr_neighbor_roam_init(struct mac_context *mac, uint8_t sessionId);
+void csr_neighbor_roam_close(struct mac_context *mac, uint8_t sessionId);
+QDF_STATUS csr_neighbor_roam_transit_to_cfg_chan_scan(struct mac_context *mac,
 		uint8_t sessionId);
-QDF_STATUS csrNeighborRoamTransitionToPreauthDone(tpAniSirGlobal mac);
-QDF_STATUS csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal mac,
+QDF_STATUS csrNeighborRoamTransitionToPreauthDone(struct mac_context *mac);
+QDF_STATUS csr_neighbor_roam_prepare_scan_profile_filter(struct mac_context *mac,
 		tCsrScanResultFilter *pScanFilter, uint8_t sessionId);
-QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac,
+QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(struct mac_context *mac,
 		uint8_t sessionId, QDF_STATUS limStatus);
-bool csr_neighbor_roam_is11r_assoc(tpAniSirGlobal mac, uint8_t sessionId);
+bool csr_neighbor_roam_is11r_assoc(struct mac_context *mac, uint8_t sessionId);
 #ifdef WLAN_FEATURE_HOST_ROAM
 void csr_neighbor_roam_tranistion_preauth_done_to_disconnected(
-		tpAniSirGlobal mac, uint8_t sessionId);
-bool csr_neighbor_roam_state_preauth_done(tpAniSirGlobal mac,
+		struct mac_context *mac, uint8_t sessionId);
+bool csr_neighbor_roam_state_preauth_done(struct mac_context *mac,
 		uint8_t sessionId);
-QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_issue_reassociate_cmd(struct mac_context *mac,
 		uint32_t sessionId);
-void csr_neighbor_roam_free_roamable_bss_list(tpAniSirGlobal mac_ctx,
+void csr_neighbor_roam_free_roamable_bss_list(struct mac_context *mac_ctx,
 		tDblLinkList *llist);
-bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal mac,
+bool csr_neighbor_roam_get_handoff_ap_info(struct mac_context *mac,
 		tpCsrNeighborRoamBSSInfo pHandoffNode, uint8_t sessionId);
-QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_issue_reassociate(struct mac_context *mac,
 		uint32_t sessionId, tSirBssDescription *pSirBssDesc,
 		tDot11fBeaconIEs *pIes, struct csr_roam_profile *pProfile);
-void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac, uint8_t sessionId);
-QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal mac,
+void csr_neighbor_roam_request_handoff(struct mac_context *mac, uint8_t sessionId);
+QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(struct mac_context *mac,
 		void *pMsg);
-QDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal mac,
+QDF_STATUS csr_neighbor_roam_process_scan_complete(struct mac_context *mac,
 		uint8_t sessionId);
-bool csr_neighbor_roam_is_handoff_in_progress(tpAniSirGlobal mac,
+bool csr_neighbor_roam_is_handoff_in_progress(struct mac_context *mac,
 		uint8_t sessionId);
 void csr_neighbor_roam_reset_preauth_control_info(
-		tpAniSirGlobal mac_ctx, uint8_t session_id);
-void csr_neighbor_roam_purge_preauth_failed_list(tpAniSirGlobal mac);
+		struct mac_context *mac_ctx, uint8_t session_id);
+void csr_neighbor_roam_purge_preauth_failed_list(struct mac_context *mac);
 #else
-static inline bool csr_neighbor_roam_state_preauth_done(tpAniSirGlobal mac,
+static inline bool csr_neighbor_roam_state_preauth_done(struct mac_context *mac,
 		uint8_t sessionId)
 {
 	return false;
 }
-static inline QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal mac,
+static inline QDF_STATUS csr_roam_issue_reassociate_cmd(struct mac_context *mac,
 		uint32_t sessionId)
 {
 	return QDF_STATUS_E_NOSUPPORT;
 }
-static inline QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal mac,
+static inline QDF_STATUS csr_roam_issue_reassociate(struct mac_context *mac,
 		uint32_t sessionId, tSirBssDescription *pSirBssDesc,
 		tDot11fBeaconIEs *pIes, struct csr_roam_profile *pProfile)
 {
 	return QDF_STATUS_E_NOSUPPORT;
 }
 static inline QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(
-		tpAniSirGlobal mac, void *pMsg)
+		struct mac_context *mac, void *pMsg)
 {
 	return QDF_STATUS_E_NOSUPPORT;
 }
 static inline QDF_STATUS csr_neighbor_roam_process_scan_complete(
-		tpAniSirGlobal mac, uint8_t sessionId)
+		struct mac_context *mac, uint8_t sessionId)
 {
 	return QDF_STATUS_E_NOSUPPORT;
 }
 static inline void csr_neighbor_roam_tranistion_preauth_done_to_disconnected(
-		tpAniSirGlobal mac, uint8_t sessionId)
+		struct mac_context *mac, uint8_t sessionId)
 {}
 static inline void csr_neighbor_roam_free_roamable_bss_list(
-		tpAniSirGlobal mac_ctx, tDblLinkList *llist)
+		struct mac_context *mac_ctx, tDblLinkList *llist)
 {}
-static inline void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac,
+static inline void csr_neighbor_roam_request_handoff(struct mac_context *mac,
 		uint8_t sessionId)
 {}
 static inline void csr_neighbor_roam_reset_preauth_control_info(
-		tpAniSirGlobal mac_ctx, uint8_t session_id)
+		struct mac_context *mac_ctx, uint8_t session_id)
 {}
 static inline void csr_neighbor_roam_purge_preauth_failed_list(
-		tpAniSirGlobal mac)
+		struct mac_context *mac)
 {}
-static inline bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal mac,
+static inline bool csr_neighbor_roam_get_handoff_ap_info(struct mac_context *mac,
 		tpCsrNeighborRoamBSSInfo pHandoffNode, uint8_t sessionId)
 {
 	return false;
 }
-static inline bool csr_neighbor_roam_is_handoff_in_progress(tpAniSirGlobal mac,
+static inline bool csr_neighbor_roam_is_handoff_in_progress(struct mac_context *mac,
 		uint8_t sessionId)
 {
 	return false;
 }
 #endif
-bool csr_neighbor_middle_of_roaming(tpAniSirGlobal mac, uint8_t sessionId);
-QDF_STATUS csr_neighbor_roam_update_config(tpAniSirGlobal mac_ctx,
+bool csr_neighbor_middle_of_roaming(struct mac_context *mac, uint8_t sessionId);
+QDF_STATUS csr_neighbor_roam_update_config(struct mac_context *mac_ctx,
 		uint8_t session_id, uint8_t value, uint8_t reason);
-QDF_STATUS csr_neighbor_roam_update_fast_roaming_enabled(tpAniSirGlobal mac,
+QDF_STATUS csr_neighbor_roam_update_fast_roaming_enabled(struct mac_context *mac,
 		uint8_t sessionId, const bool fastRoamEnabled);
 QDF_STATUS csr_neighbor_roam_channels_filter_by_current_band(
-		tpAniSirGlobal mac, uint8_t sessionId,
+		struct mac_context *mac, uint8_t sessionId,
 		uint8_t *pInputChannelList,
 		uint8_t inputNumOfChannels,
 		uint8_t *pOutputChannelList,
 		uint8_t *pMergedOutputNumOfChannels);
-QDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal mac,
+QDF_STATUS csr_neighbor_roam_merge_channel_lists(struct mac_context *mac,
 		uint8_t *pInputChannelList,
 		uint8_t inputNumOfChannels,
 		uint8_t *pOutputChannelList,
 		uint8_t outputNumOfChannels,
 		uint8_t *pMergedOutputNumOfChannels);
-void csr_roam_reset_roam_params(tpAniSirGlobal mac_ptr);
+void csr_roam_reset_roam_params(struct mac_context *mac_ptr);
 #define ROAM_SCAN_OFFLOAD_START                     1
 #define ROAM_SCAN_OFFLOAD_STOP                      2
 #define ROAM_SCAN_OFFLOAD_RESTART                   3
@@ -326,10 +326,10 @@ void csr_roam_reset_roam_params(tpAniSirGlobal mac_ptr);
 #define REASON_DRIVER_ENABLED                       43
 
 #if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD)
-QDF_STATUS csr_roam_offload_scan(tpAniSirGlobal mac, uint8_t sessionId,
+QDF_STATUS csr_roam_offload_scan(struct mac_context *mac, uint8_t sessionId,
 		uint8_t command, uint8_t reason);
 #else
-static inline QDF_STATUS csr_roam_offload_scan(tpAniSirGlobal mac,
+static inline QDF_STATUS csr_roam_offload_scan(struct mac_context *mac,
 		uint8_t sessionId, uint8_t command, uint8_t reason)
 {
 	return QDF_STATUS_E_NOSUPPORT;
@@ -348,7 +348,7 @@ static inline QDF_STATUS csr_roam_offload_scan(tpAniSirGlobal mac,
  * Return: session id of STA on which roaming is enabled
  */
 uint8_t csr_get_roam_enabled_sta_sessionid(
-	tpAniSirGlobal mac_ctx);
+	struct mac_context *mac_ctx);
 
 #if defined(WLAN_FEATURE_FILS_SK)
 /**
@@ -361,61 +361,61 @@ uint8_t csr_get_roam_enabled_sta_sessionid(
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS csr_update_fils_config(tpAniSirGlobal mac, uint8_t session_id,
+QDF_STATUS csr_update_fils_config(struct mac_context *mac, uint8_t session_id,
 				  struct csr_roam_profile *src_profile);
 #endif
 
-QDF_STATUS csr_neighbor_roam_handoff_req_hdlr(tpAniSirGlobal mac, void *pMsg);
-QDF_STATUS csr_neighbor_roam_proceed_with_handoff_req(tpAniSirGlobal mac,
+QDF_STATUS csr_neighbor_roam_handoff_req_hdlr(struct mac_context *mac, void *pMsg);
+QDF_STATUS csr_neighbor_roam_proceed_with_handoff_req(struct mac_context *mac,
 		uint8_t sessionId);
-QDF_STATUS csr_neighbor_roam_sssid_scan_done(tpAniSirGlobal mac,
+QDF_STATUS csr_neighbor_roam_sssid_scan_done(struct mac_context *mac,
 		uint8_t sessionId, QDF_STATUS status);
-QDF_STATUS csr_neighbor_roam_start_lfr_scan(tpAniSirGlobal mac,
+QDF_STATUS csr_neighbor_roam_start_lfr_scan(struct mac_context *mac,
 		uint8_t sessionId);
 
 #ifdef FEATURE_WLAN_ESE
-QDF_STATUS csr_set_cckm_ie(tpAniSirGlobal mac, const uint8_t sessionId,
+QDF_STATUS csr_set_cckm_ie(struct mac_context *mac, const uint8_t sessionId,
 		const uint8_t *pCckmIe, const uint8_t ccKmIeLen);
-QDF_STATUS csr_roam_read_tsf(tpAniSirGlobal mac, uint8_t *pTimestamp,
+QDF_STATUS csr_roam_read_tsf(struct mac_context *mac, uint8_t *pTimestamp,
 		const uint8_t sessionId);
 #endif /* FEATURE_WLAN_ESE */
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
-QDF_STATUS csr_roam_synch_callback(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_synch_callback(struct mac_context *mac,
 	roam_offload_synch_ind *roam_synch_data,
 	tpSirBssDescription  bss_desc_ptr, enum sir_roam_op_code reason);
 #else
-static inline QDF_STATUS csr_roam_synch_callback(tpAniSirGlobal mac,
+static inline QDF_STATUS csr_roam_synch_callback(struct mac_context *mac,
 	roam_offload_synch_ind *roam_synch_data,
 	tpSirBssDescription  bss_desc_ptr, enum sir_roam_op_code reason)
 {
 	return QDF_STATUS_E_NOSUPPORT;
 }
 #endif
-void csr_neighbor_roam_state_transition(tpAniSirGlobal mac_ctx,
+void csr_neighbor_roam_state_transition(struct mac_context *mac_ctx,
 		uint8_t newstate, uint8_t session);
 uint8_t *csr_neighbor_roam_state_to_string(uint8_t state);
 tpCsrNeighborRoamBSSInfo csr_neighbor_roam_next_roamable_ap(
-		tpAniSirGlobal mac_ctx, tDblLinkList *llist,
+		struct mac_context *mac_ctx, tDblLinkList *llist,
 		tpCsrNeighborRoamBSSInfo neighbor_entry);
-bool csr_neighbor_roam_remove_roamable_ap_list_entry(tpAniSirGlobal mac,
+bool csr_neighbor_roam_remove_roamable_ap_list_entry(struct mac_context *mac,
 		tDblLinkList *pList, tpCsrNeighborRoamBSSInfo pNeighborEntry);
-void csr_neighbor_roam_free_neighbor_roam_bss_node(tpAniSirGlobal mac,
+void csr_neighbor_roam_free_neighbor_roam_bss_node(struct mac_context *mac,
 		tpCsrNeighborRoamBSSInfo neighborRoamBSSNode);
-QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac,
+QDF_STATUS csr_neighbor_roam_issue_preauth_req(struct mac_context *mac,
 		uint8_t sessionId);
-bool csr_neighbor_roam_is_preauth_candidate(tpAniSirGlobal mac,
+bool csr_neighbor_roam_is_preauth_candidate(struct mac_context *mac,
 		    uint8_t sessionId, tSirMacAddr bssId);
 #ifdef FEATURE_WLAN_LFR_METRICS
-void csr_neighbor_roam_send_lfr_metric_event(tpAniSirGlobal mac_ctx,
+void csr_neighbor_roam_send_lfr_metric_event(struct mac_context *mac_ctx,
 		uint8_t session_id, tSirMacAddr bssid, eRoamCmdStatus status);
 #else
 static inline void csr_neighbor_roam_send_lfr_metric_event(
-		tpAniSirGlobal mac_ctx, uint8_t session_id,
+		struct mac_context *mac_ctx, uint8_t session_id,
 		tSirMacAddr bssid, eRoamCmdStatus status)
 {}
 #endif
-QDF_STATUS csr_roam_stop_wait_for_key_timer(tpAniSirGlobal mac);
-QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_stop_wait_for_key_timer(struct mac_context *mac);
+QDF_STATUS csr_roam_copy_connected_profile(struct mac_context *mac,
 		uint32_t sessionId, struct csr_roam_profile *pDstProfile);
 
 /**

core/sme/inc/csr_support.h

@@ -221,7 +221,7 @@ bool csr_get_bss_id_bss_desc(tSirBssDescription *pSirBssDesc,
 			     struct qdf_mac_addr *pBssId);
 bool csr_is_bss_id_equal(tSirBssDescription *pSirBssDesc1,
 			 tSirBssDescription *pSirBssDesc2);
-eCsrMediaAccessType csr_get_qos_from_bss_desc(tpAniSirGlobal mac_ctx,
+eCsrMediaAccessType csr_get_qos_from_bss_desc(struct mac_context *mac_ctx,
 					      tSirBssDescription *pSirBssDesc,
 					      tDot11fBeaconIEs *pIes);
 bool csr_is_nullssid(uint8_t *pBssSsid, uint8_t len);
@@ -229,17 +229,17 @@ bool csr_is_infra_bss_desc(tSirBssDescription *pSirBssDesc);
 bool csr_is_ibss_bss_desc(tSirBssDescription *pSirBssDesc);
 bool csr_is_privacy(tSirBssDescription *pSirBssDesc);
 tSirResultCodes csr_get_de_auth_rsp_status_code(tSirSmeDeauthRsp *pSmeRsp);
-uint32_t csr_get_frag_thresh(tpAniSirGlobal mac_ctx);
-uint32_t csr_get_rts_thresh(tpAniSirGlobal mac_ctx);
+uint32_t csr_get_frag_thresh(struct mac_context *mac_ctx);
+uint32_t csr_get_rts_thresh(struct mac_context *mac_ctx);
 eCsrPhyMode csr_get_phy_mode_from_bssDesc(tSirBssDescription *pSirBssDesc);
-uint32_t csr_get11h_power_constraint(tpAniSirGlobal mac_ctx,
+uint32_t csr_get11h_power_constraint(struct mac_context *mac_ctx,
 				     tDot11fIEPowerConstraints *constraints);
-uint8_t csr_construct_rsn_ie(tpAniSirGlobal mac, uint32_t sessionId,
+uint8_t csr_construct_rsn_ie(struct mac_context *mac, uint32_t sessionId,
 			     struct csr_roam_profile *pProfile,
 			     tSirBssDescription *pSirBssDesc,
 			     tDot11fBeaconIEs *pIes, tCsrRSNIe *pRSNIe);
 
-uint8_t csr_construct_wpa_ie(tpAniSirGlobal mac, uint8_t session_id,
+uint8_t csr_construct_wpa_ie(struct mac_context *mac, uint8_t session_id,
 			     struct csr_roam_profile *pProfile,
 			     tSirBssDescription *pSirBssDesc,
 			     tDot11fBeaconIEs *pIes, tCsrWpaIe *pWpaIe);
@@ -252,12 +252,12 @@ bool csr_is_profile_wapi(struct csr_roam_profile *pProfile);
  * Or else construct one from the BSS Caller allocated memory for pWpaIe and
  * guarrantee it can contain a max length WPA IE
  */
-uint8_t csr_retrieve_wpa_ie(tpAniSirGlobal mac, uint8_t session_id,
+uint8_t csr_retrieve_wpa_ie(struct mac_context *mac, uint8_t session_id,
 			    struct csr_roam_profile *pProfile,
 			    tSirBssDescription *pSirBssDesc,
 			    tDot11fBeaconIEs *pIes, tCsrWpaIe *pWpaIe);
 
-bool csr_is_ssid_equal(tpAniSirGlobal mac,
+bool csr_is_ssid_equal(struct mac_context *mac,
 		       tSirBssDescription *pSirBssDesc1,
 		       tSirBssDescription *pSirBssDesc2,
 		       tDot11fBeaconIEs *pIes2);
@@ -271,7 +271,7 @@ bool csr_is_profile_rsn(struct csr_roam_profile *pProfile);
  * else construct one from the BSS Caller allocated memory for pWpaIe and
  * guarantee it can contain a max length WPA IE
  */
-uint8_t csr_retrieve_rsn_ie(tpAniSirGlobal mac, uint32_t sessionId,
+uint8_t csr_retrieve_rsn_ie(struct mac_context *mac, uint32_t sessionId,
 			    struct csr_roam_profile *pProfile,
 			    tSirBssDescription *pSirBssDesc,
 			    tDot11fBeaconIEs *pIes, tCsrRSNIe *pRsnIe);
@@ -281,7 +281,7 @@ uint8_t csr_retrieve_rsn_ie(tpAniSirGlobal mac, uint32_t sessionId,
  * Or else construct one from the BSS. Caller allocated memory for pWapiIe and
  * guarrantee it can contain a max length WAPI IE
  */
-uint8_t csr_retrieve_wapi_ie(tpAniSirGlobal mac, uint32_t sessionId,
+uint8_t csr_retrieve_wapi_ie(struct mac_context *mac, uint32_t sessionId,
 			     struct csr_roam_profile *pProfile,
 			     tSirBssDescription *pSirBssDesc,
 			     tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe);
@@ -294,7 +294,7 @@ tAniEdType csr_translate_encrypt_type_to_ed_type(
  * pIes shall contain IEs from pSirBssDesc.
  * It shall be returned from function csr_get_parsed_bss_description_ies
  */
-bool csr_is_security_match(tpAniSirGlobal mac_ctx, tCsrAuthList *auth_type,
+bool csr_is_security_match(struct mac_context *mac_ctx, tCsrAuthList *auth_type,
 			   tCsrEncryptionList *uc_enc_type,
 			   tCsrEncryptionList *mc_enc_type, bool *mfp_enabled,
 			   uint8_t *mfp_required, uint8_t *mfp_capable,
@@ -306,12 +306,12 @@ bool csr_is_bssid_match(struct qdf_mac_addr *pProfBssid,
 			struct qdf_mac_addr *BssBssid);
 void csr_add_rate_bitmap(uint8_t rate, uint16_t *pRateBitmap);
 bool csr_check_rate_bitmap(uint8_t rate, uint16_t RateBitmap);
-bool csr_rates_is_dot11_rate_supported(tpAniSirGlobal mac_ctx, uint8_t rate);
+bool csr_rates_is_dot11_rate_supported(struct mac_context *mac_ctx, uint8_t rate);
 uint16_t csr_rates_find_best_rate(tSirMacRateSet *pSuppRates,
 		tSirMacRateSet *pExtRates, tSirMacPropRateSet *pPropRates);
 tSirBssType csr_translate_bsstype_to_mac_type(eCsrRoamBssType csrtype);
 /* Caller allocates memory for pIEStruct */
-QDF_STATUS csr_parse_bss_description_ies(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_parse_bss_description_ies(struct mac_context *mac_ctx,
 					 tSirBssDescription *pBssDesc,
 					 tDot11fBeaconIEs *pIEStruct);
 /*
@@ -319,13 +319,13 @@ QDF_STATUS csr_parse_bss_description_ies(tpAniSirGlobal mac_ctx,
  * Caller must free the memory. after it is done with the data only if
  * this function succeeds
  */
-QDF_STATUS csr_get_parsed_bss_description_ies(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_get_parsed_bss_description_ies(struct mac_context *mac_ctx,
 					      tSirBssDescription *pBssDesc,
 					      tDot11fBeaconIEs **ppIEStruct);
 
-tSirScanType csr_get_scan_type(tpAniSirGlobal mac, uint8_t chnId);
+tSirScanType csr_get_scan_type(struct mac_context *mac, uint8_t chnId);
 uint8_t csr_to_upper(uint8_t ch);
-QDF_STATUS csr_get_phy_mode_from_bss(tpAniSirGlobal mac,
+QDF_STATUS csr_get_phy_mode_from_bss(struct mac_context *mac,
 		tSirBssDescription *pBSSDescription,
 		eCsrPhyMode *pPhyMode, tDot11fBeaconIEs *pIes);
 /*
@@ -335,16 +335,16 @@ QDF_STATUS csr_get_phy_mode_from_bss(tpAniSirGlobal mac,
  * the user wants. There may be discrepency in it. UAPSD-bypass logic should
  * decide if it needs to reassoc
  */
-QDF_STATUS csr_reassoc(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_reassoc(struct mac_context *mac, uint32_t sessionId,
 		tCsrRoamModifyProfileFields *pModProfileFields,
 		uint32_t *pRoamId, bool fForce);
 
 /* BeaconInterval validation for MCC support */
-QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal mac, uint8_t channelId,
+QDF_STATUS csr_validate_mcc_beacon_interval(struct mac_context *mac, uint8_t channelId,
 		uint16_t *beaconInterval, uint32_t cursessionId,
 		enum QDF_OPMODE currBssPersona);
-bool csr_is_profile11r(tpAniSirGlobal mac, struct csr_roam_profile *pProfile);
-bool csr_is_auth_type11r(tpAniSirGlobal mac, eCsrAuthType AuthType,
+bool csr_is_profile11r(struct mac_context *mac, struct csr_roam_profile *pProfile);
+bool csr_is_auth_type11r(struct mac_context *mac, eCsrAuthType AuthType,
 			 uint8_t mdiePresent);
 #ifdef FEATURE_WLAN_ESE
 bool csr_is_profile_ese(struct csr_roam_profile *pProfile);

core/sme/src/csr/csr_api_scan.c

@@ -74,20 +74,20 @@
 #define PCL_ADVANTAGE 30
 #define PCL_RSSI_THRESHOLD -75
 
-static void csr_set_cfg_valid_channel_list(tpAniSirGlobal mac, uint8_t
+static void csr_set_cfg_valid_channel_list(struct mac_context *mac, uint8_t
 					*pChannelList, uint8_t NumChannels);
-static void csr_save_tx_power_to_cfg(tpAniSirGlobal mac, tDblLinkList *pList,
+static void csr_save_tx_power_to_cfg(struct mac_context *mac, tDblLinkList *pList,
 			      uint32_t cfgId);
-static void csr_set_cfg_country_code(tpAniSirGlobal mac, uint8_t *countryCode);
-static void csr_purge_channel_power(tpAniSirGlobal mac, tDblLinkList
+static void csr_set_cfg_country_code(struct mac_context *mac, uint8_t *countryCode);
+static void csr_purge_channel_power(struct mac_context *mac, tDblLinkList
 							*pChannelList);
-static bool csr_roam_is_valid_channel(tpAniSirGlobal mac, uint8_t channel);
+static bool csr_roam_is_valid_channel(struct mac_context *mac, uint8_t channel);
 
 #define CSR_IS_SOCIAL_CHANNEL(channel) \
 	(((channel) == 1) || ((channel) == 6) || ((channel) == 11))
 
 /* pResult is invalid calling this function. */
-void csr_free_scan_result_entry(tpAniSirGlobal mac, struct tag_csrscan_result
+void csr_free_scan_result_entry(struct mac_context *mac, struct tag_csrscan_result
 				*pResult)
 {
 	if (NULL != pResult->Result.pvIes)
@@ -96,7 +96,7 @@ void csr_free_scan_result_entry(tpAniSirGlobal mac, struct tag_csrscan_result
 	qdf_mem_free(pResult);
 }
 
-static QDF_STATUS csr_ll_scan_purge_result(tpAniSirGlobal mac,
+static QDF_STATUS csr_ll_scan_purge_result(struct mac_context *mac,
 					   tDblLinkList *pList)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
@@ -116,7 +116,7 @@ static QDF_STATUS csr_ll_scan_purge_result(tpAniSirGlobal mac,
 	return status;
 }
 
-QDF_STATUS csr_scan_open(tpAniSirGlobal mac_ctx)
+QDF_STATUS csr_scan_open(struct mac_context *mac_ctx)
 {
 	csr_ll_open(&mac_ctx->scan.channelPowerInfoList24);
 	csr_ll_open(&mac_ctx->scan.channelPowerInfoList5G);
@@ -124,7 +124,7 @@ QDF_STATUS csr_scan_open(tpAniSirGlobal mac_ctx)
 	return QDF_STATUS_SUCCESS;
 }
 
-QDF_STATUS csr_scan_close(tpAniSirGlobal mac)
+QDF_STATUS csr_scan_close(struct mac_context *mac)
 {
 	csr_purge_channel_power(mac, &mac->scan.channelPowerInfoList24);
 	csr_purge_channel_power(mac, &mac->scan.channelPowerInfoList5G);
@@ -133,7 +133,7 @@ QDF_STATUS csr_scan_close(tpAniSirGlobal mac)
 	ucfg_scan_set_enable(mac->psoc, false);
 	return QDF_STATUS_SUCCESS;
 }
-QDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_scan_handle_search_for_ssid(struct mac_context *mac_ctx,
 					   uint32_t session_id)
 {
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
@@ -249,7 +249,7 @@ csr_handle_fils_scan_for_ssid_failure(struct csr_roam_profile *roam_profile,
 }
 #endif
 
-QDF_STATUS csr_scan_handle_search_for_ssid_failure(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_scan_handle_search_for_ssid_failure(struct mac_context *mac_ctx,
 						  uint32_t session_id)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
@@ -338,7 +338,7 @@ roam_completion:
 	return status;
 }
 
-QDF_STATUS csr_scan_result_purge(tpAniSirGlobal mac,
+QDF_STATUS csr_scan_result_purge(struct mac_context *mac,
 				 tScanResultHandle hScanList)
 {
 	QDF_STATUS status = QDF_STATUS_E_INVAL;
@@ -354,7 +354,7 @@ QDF_STATUS csr_scan_result_purge(tpAniSirGlobal mac,
 }
 
 /* Add the channel to the occupiedChannels array */
-static void csr_scan_add_to_occupied_channels(tpAniSirGlobal mac,
+static void csr_scan_add_to_occupied_channels(struct mac_context *mac,
 					struct tag_csrscan_result *pResult,
 					uint8_t sessionId,
 					struct csr_channel *occupied_ch,
@@ -393,7 +393,7 @@ static void csr_scan_add_to_occupied_channels(tpAniSirGlobal mac,
 
 /* Put the BSS into the scan result list */
 /* pIes can not be NULL */
-static void csr_scan_add_result(tpAniSirGlobal mac_ctx,
+static void csr_scan_add_result(struct mac_context *mac_ctx,
 				struct tag_csrscan_result *pResult)
 {
 	qdf_nbuf_t buf;
@@ -467,7 +467,7 @@ static void csr_scan_add_result(tpAniSirGlobal mac_ctx,
  * csr_scan_get_result returns with a failure because
  * of not being able to find the roaming BSS.
  */
-static bool csr_scan_flush_denied(tpAniSirGlobal mac)
+static bool csr_scan_flush_denied(struct mac_context *mac)
 {
 	uint8_t sessionId;
 
@@ -480,7 +480,7 @@ static bool csr_scan_flush_denied(tpAniSirGlobal mac)
 	return 0;
 }
 
-static bool csr_scan_save_bss_description(tpAniSirGlobal mac,
+static bool csr_scan_save_bss_description(struct mac_context *mac,
 						     tSirBssDescription *
 						     pBSSDescription)
 {
@@ -515,14 +515,14 @@ static bool csr_scan_save_bss_description(tpAniSirGlobal mac,
 }
 
 /* Append a Bss Description... */
-bool csr_scan_append_bss_description(tpAniSirGlobal mac,
+bool csr_scan_append_bss_description(struct mac_context *mac,
 				     tSirBssDescription *pSirBssDescription)
 {
 	return csr_scan_save_bss_description(mac,
 					pSirBssDescription);
 }
 
-static void csr_purge_channel_power(tpAniSirGlobal mac, tDblLinkList
+static void csr_purge_channel_power(struct mac_context *mac, tDblLinkList
 					*pChannelList)
 {
 	struct csr_channel_powerinfo *pChannelSet;
@@ -548,7 +548,7 @@ static void csr_purge_channel_power(tpAniSirGlobal mac, tDblLinkList
  * Input: pCountryInfo -- the country code (e.g. "USI"), channel list, and power
  * limit are all stored inside this data structure
  */
-QDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal mac,
+QDF_STATUS csr_save_to_channel_power2_g_5_g(struct mac_context *mac,
 					    uint32_t tableSize,
 					    tSirMacChanInfo *channelTable)
 {
@@ -639,7 +639,7 @@ QDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal mac,
 	return QDF_STATUS_SUCCESS;
 }
 
-static void csr_clear_dfs_channel_list(tpAniSirGlobal mac)
+static void csr_clear_dfs_channel_list(struct mac_context *mac)
 {
 	tSirMbMsg *pMsg;
 	uint16_t msgLen;
@@ -653,7 +653,7 @@ static void csr_clear_dfs_channel_list(tpAniSirGlobal mac)
 	}
 }
 
-void csr_apply_power2_current(tpAniSirGlobal mac)
+void csr_apply_power2_current(struct mac_context *mac)
 {
 	sme_debug("Updating Cfg with power settings");
 	csr_save_tx_power_to_cfg(mac, &mac->scan.channelPowerInfoList24,
@@ -662,7 +662,7 @@ void csr_apply_power2_current(tpAniSirGlobal mac)
 				 BAND_5G);
 }
 
-void csr_apply_channel_power_info_to_fw(tpAniSirGlobal mac_ctx,
+void csr_apply_channel_power_info_to_fw(struct mac_context *mac_ctx,
 					  struct csr_channel *ch_lst,
 					  uint8_t *countryCode)
 {
@@ -698,7 +698,7 @@ void csr_apply_channel_power_info_to_fw(tpAniSirGlobal mac_ctx,
 }
 
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
-static void csr_diag_reset_country_information(tpAniSirGlobal mac)
+static void csr_diag_reset_country_information(struct mac_context *mac)
 {
 
 	host_log_802_11d_pkt_type *p11dLog;
@@ -741,7 +741,7 @@ static void csr_diag_reset_country_information(tpAniSirGlobal mac)
  *
  * Return: none
  */
-void csr_apply_channel_power_info_wrapper(tpAniSirGlobal mac)
+void csr_apply_channel_power_info_wrapper(struct mac_context *mac)
 {
 
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
@@ -757,7 +757,7 @@ void csr_apply_channel_power_info_wrapper(tpAniSirGlobal mac)
 	qdf_mem_set(&mac->scan.channels11d, sizeof(mac->scan.channels11d), 0);
 }
 
-void csr_clear_votes_for_country_info(tpAniSirGlobal mac)
+void csr_clear_votes_for_country_info(struct mac_context *mac)
 {
 	mac->scan.countryCodeCount = 0;
 	qdf_mem_set(mac->scan.votes11d,
@@ -768,7 +768,7 @@ void csr_clear_votes_for_country_info(tpAniSirGlobal mac)
 /* caller allocated memory for pNumChn and pChnPowerInfo */
 /* As input, *pNumChn has the size of the array of pChnPowerInfo */
 /* Upon return, *pNumChn has the number of channels assigned. */
-static void csr_get_channel_power_info(tpAniSirGlobal mac, tDblLinkList *list,
+static void csr_get_channel_power_info(struct mac_context *mac, tDblLinkList *list,
 				       uint32_t *num_ch,
 				       struct channel_power *chn_pwr_info)
 {
@@ -793,7 +793,7 @@ static void csr_get_channel_power_info(tpAniSirGlobal mac, tDblLinkList *list,
 	*num_ch = chn_idx;
 }
 
-static void csr_diag_apply_country_info(tpAniSirGlobal mac_ctx)
+static void csr_diag_apply_country_info(struct mac_context *mac_ctx)
 {
 	host_log_802_11d_pkt_type *p11dLog;
 	struct channel_power chnPwrInfo[WNI_CFG_VALID_CHANNEL_LIST_LEN];
@@ -851,7 +851,7 @@ diag_end:
  *
  * Return: none
  */
-void csr_apply_country_information(tpAniSirGlobal mac)
+void csr_apply_country_information(struct mac_context *mac)
 {
 	v_REGDOMAIN_t domainId;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
@@ -880,7 +880,7 @@ void csr_apply_country_information(tpAniSirGlobal mac)
 	mac->scan.curScanType = eSIR_ACTIVE_SCAN;
 }
 
-void csr_save_channel_power_for_band(tpAniSirGlobal mac, bool fill_5f)
+void csr_save_channel_power_for_band(struct mac_context *mac, bool fill_5f)
 {
 	uint32_t idx, count = 0;
 	tSirMacChanInfo *chan_info;
@@ -929,7 +929,7 @@ void csr_save_channel_power_for_band(tpAniSirGlobal mac, bool fill_5f)
 	qdf_mem_free(ch_info_start);
 }
 
-bool csr_is_supported_channel(tpAniSirGlobal mac, uint8_t channelId)
+bool csr_is_supported_channel(struct mac_context *mac, uint8_t channelId)
 {
 	bool fRet = false;
 	uint32_t i;
@@ -949,7 +949,7 @@ bool csr_is_supported_channel(tpAniSirGlobal mac, uint8_t channelId)
  * 802.11D only: Gather 11d IE via beacon or Probe response and store them in
  * pAdapter->channels11d
  */
-bool csr_learn_11dcountry_information(tpAniSirGlobal mac,
+bool csr_learn_11dcountry_information(struct mac_context *mac,
 				   tSirBssDescription *pSirBssDesc,
 				   tDot11fBeaconIEs *pIes, bool fForce)
 {
@@ -1017,7 +1017,7 @@ free_ie:
 }
 
 static enum csr_scancomplete_nextcommand csr_scan_get_next_command_state(
-						tpAniSirGlobal mac_ctx,
+						struct mac_context *mac_ctx,
 						uint32_t session_id,
 						eCsrScanStatus scan_status,
 						uint8_t *chan)
@@ -1058,7 +1058,7 @@ static enum csr_scancomplete_nextcommand csr_scan_get_next_command_state(
 
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
 static void
-csr_diag_scan_complete(tpAniSirGlobal mac_ctx,
+csr_diag_scan_complete(struct mac_context *mac_ctx,
 		       eCsrScanStatus scan_status)
 {
 	host_log_scan_pkt_type *pScanLog = NULL;
@@ -1144,7 +1144,7 @@ csr_diag_scan_complete(tpAniSirGlobal mac_ctx,
  * Return: None
  */
 
-void csr_saved_scan_cmd_free_fields(tpAniSirGlobal mac_ctx,
+void csr_saved_scan_cmd_free_fields(struct mac_context *mac_ctx,
 				    struct csr_roam_session *session)
 {
 	if (session->scan_info.profile) {
@@ -1169,7 +1169,7 @@ void csr_saved_scan_cmd_free_fields(tpAniSirGlobal mac_ctx,
  *
  * Return: QDF_STATUS
  */
-static QDF_STATUS csr_save_profile(tpAniSirGlobal mac_ctx,
+static QDF_STATUS csr_save_profile(struct mac_context *mac_ctx,
 				   uint32_t session_id)
 {
 	struct tag_csrscan_result *scan_result;
@@ -1232,7 +1232,7 @@ error:
 	return QDF_STATUS_E_FAILURE;
 }
 
-static void csr_handle_nxt_cmd(tpAniSirGlobal mac_ctx,
+static void csr_handle_nxt_cmd(struct mac_context *mac_ctx,
 		   enum csr_scancomplete_nextcommand nxt_cmd,
 		   uint32_t session_id,
 		   uint8_t chan)
@@ -1284,13 +1284,13 @@ void csr_scan_callback(struct wlan_objmgr_vdev *vdev,
 {
 	eCsrScanStatus scan_status = eCSR_SCAN_FAILURE;
 	enum csr_scancomplete_nextcommand NextCommand = eCsrNextScanNothing;
-	tpAniSirGlobal mac_ctx;
+	struct mac_context *mac_ctx;
 	struct csr_roam_session *session;
 	uint32_t session_id = 0;
 	uint8_t chan = 0;
 	bool success = false;
 
-	mac_ctx = (tpAniSirGlobal)arg;
+	mac_ctx = (struct mac_context *)arg;
 
 	qdf_mtrace(QDF_MODULE_ID_SCAN, QDF_MODULE_ID_SME, event->type,
 		   event->vdev_id, event->scan_id);
@@ -1336,7 +1336,7 @@ void csr_scan_callback(struct wlan_objmgr_vdev *vdev,
 
 }
 
-tCsrScanResultInfo *csr_scan_result_get_first(tpAniSirGlobal mac,
+tCsrScanResultInfo *csr_scan_result_get_first(struct mac_context *mac,
 					      tScanResultHandle hScanResult)
 {
 	tListElem *pEntry;
@@ -1360,7 +1360,7 @@ tCsrScanResultInfo *csr_scan_result_get_first(tpAniSirGlobal mac,
 	return pRet;
 }
 
-tCsrScanResultInfo *csr_scan_result_get_next(tpAniSirGlobal mac,
+tCsrScanResultInfo *csr_scan_result_get_next(struct mac_context *mac,
 					     tScanResultHandle hScanResult)
 {
 	tListElem *pEntry = NULL;
@@ -1393,7 +1393,7 @@ tCsrScanResultInfo *csr_scan_result_get_next(tpAniSirGlobal mac,
  * This function moves the first BSS that matches the bssid to the
  * head of the result
  */
-QDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal mac,
+QDF_STATUS csr_move_bss_to_head_from_bssid(struct mac_context *mac,
 					   struct qdf_mac_addr *bssid,
 					   tScanResultHandle hScanResult)
 {
@@ -1440,7 +1440,7 @@ QDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal mac,
  *
  * Return: Success - QDF_STATUS_SUCCESS, Failure - error number
  */
-QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id,
+QDF_STATUS csr_scan_for_ssid(struct mac_context *mac_ctx, uint32_t session_id,
 			struct csr_roam_profile *profile, uint32_t roam_id,
 			bool notify)
 {
@@ -1578,7 +1578,7 @@ error:
 	return status;
 }
 
-static void csr_set_cfg_valid_channel_list(tpAniSirGlobal mac,
+static void csr_set_cfg_valid_channel_list(struct mac_context *mac,
 				uint8_t *pChannelList, uint8_t NumChannels)
 {
 	uint32_t dataLen = sizeof(uint8_t) * NumChannels;
@@ -1609,7 +1609,7 @@ static void csr_set_cfg_valid_channel_list(tpAniSirGlobal mac,
 /*
  * The Tx power limits are saved in the cfg for future usage.
  */
-static void csr_save_tx_power_to_cfg(tpAniSirGlobal pMac,
+static void csr_save_tx_power_to_cfg(struct mac_context *pMac,
 				     tDblLinkList *pList,
 				     enum band_info band)
 {
@@ -1710,7 +1710,7 @@ static void csr_save_tx_power_to_cfg(tpAniSirGlobal pMac,
 	qdf_mem_free(p_buf);
 }
 
-static void csr_set_cfg_country_code(tpAniSirGlobal mac, uint8_t *countryCode)
+static void csr_set_cfg_country_code(struct mac_context *mac, uint8_t *countryCode)
 {
 	uint8_t cc[WNI_CFG_COUNTRY_CODE_LEN];
 	/* v_REGDOMAIN_t DomainId */
@@ -1741,7 +1741,7 @@ static void csr_set_cfg_country_code(tpAniSirGlobal mac, uint8_t *countryCode)
 	 */
 }
 
-QDF_STATUS csr_get_country_code(tpAniSirGlobal mac, uint8_t *pBuf,
+QDF_STATUS csr_get_country_code(struct mac_context *mac, uint8_t *pBuf,
 				uint8_t *pbLen)
 {
 	QDF_STATUS status;
@@ -1760,7 +1760,7 @@ QDF_STATUS csr_get_country_code(tpAniSirGlobal mac, uint8_t *pBuf,
 	return QDF_STATUS_E_INVAL;
 }
 
-void csr_set_cfg_scan_control_list(tpAniSirGlobal mac, uint8_t *countryCode,
+void csr_set_cfg_scan_control_list(struct mac_context *mac, uint8_t *countryCode,
 				   struct csr_channel *pChannelList)
 {
 	uint8_t i, j;
@@ -1804,7 +1804,7 @@ void csr_set_cfg_scan_control_list(tpAniSirGlobal mac, uint8_t *countryCode,
 	} /* AllocateMemory */
 }
 
-QDF_STATUS csr_scan_abort_mac_scan(tpAniSirGlobal mac_ctx, uint32_t vdev_id,
+QDF_STATUS csr_scan_abort_mac_scan(struct mac_context *mac_ctx, uint32_t vdev_id,
 				   uint32_t scan_id)
 {
 	struct scan_cancel_request *req;
@@ -1848,7 +1848,7 @@ QDF_STATUS csr_scan_abort_mac_scan(tpAniSirGlobal mac_ctx, uint32_t vdev_id,
 
 	return status;
 }
-QDF_STATUS csr_remove_nonscan_cmd_from_pending_list(tpAniSirGlobal mac,
+QDF_STATUS csr_remove_nonscan_cmd_from_pending_list(struct mac_context *mac,
 						uint8_t sessionId,
 						eSmeCommandType commandType)
 {
@@ -1897,7 +1897,7 @@ QDF_STATUS csr_remove_nonscan_cmd_from_pending_list(tpAniSirGlobal mac,
 	csr_ll_close(&localList);
 	return status;
 }
-bool csr_roam_is_valid_channel(tpAniSirGlobal mac, uint8_t channel)
+bool csr_roam_is_valid_channel(struct mac_context *mac, uint8_t channel)
 {
 	bool fValid = false;
 	uint32_t idx_valid_ch;
@@ -1912,7 +1912,7 @@ bool csr_roam_is_valid_channel(tpAniSirGlobal mac, uint8_t channel)
 	return fValid;
 }
 
-QDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal mac,
+QDF_STATUS csr_scan_create_entry_in_scan_cache(struct mac_context *mac,
 					       uint32_t sessionId,
 					       struct qdf_mac_addr bssid,
 					       uint8_t channel)
@@ -1986,7 +1986,7 @@ void update_cckmtsf(uint32_t *timeStamp0, uint32_t *timeStamp1,
  * @return Status
  */
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
-QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal mac,
+QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(struct mac_context *mac,
 		roam_offload_synch_ind *roam_sync_ind_ptr,
 		tpSirBssDescription  bss_desc_ptr)
 {
@@ -2090,7 +2090,7 @@ csr_get_bssdescr_from_scan_handle(tScanResultHandle result_handle,
 }
 
 uint8_t
-csr_get_channel_for_hw_mode_change(tpAniSirGlobal mac_ctx,
+csr_get_channel_for_hw_mode_change(struct mac_context *mac_ctx,
 				   tScanResultHandle result_handle,
 				   uint32_t session_id)
 {
@@ -2183,7 +2183,7 @@ end:
 
 uint8_t
 csr_scan_get_channel_for_hw_mode_change(
-	tpAniSirGlobal mac_ctx, uint32_t session_id,
+	struct mac_context *mac_ctx, uint32_t session_id,
 	struct csr_roam_profile *profile)
 {
 	tScanResultHandle result_handle = NULL;
@@ -2490,7 +2490,7 @@ static enum wlan_phymode csr_convert_dotllmod_phymode(eCsrPhyMode dotllmode)
 	return con_phy_mode;
 }
 
-static QDF_STATUS csr_prepare_scan_filter(tpAniSirGlobal mac_ctx,
+static QDF_STATUS csr_prepare_scan_filter(struct mac_context *mac_ctx,
 	tCsrScanResultFilter *pFilter, struct scan_filter *filter)
 {
 	int i;
@@ -2621,7 +2621,7 @@ static QDF_STATUS csr_prepare_scan_filter(tpAniSirGlobal mac_ctx,
  * @scan_entry: scan entry
  * @bss_descr: bss description
  */
-static void csr_update_bss_with_fils_data(tpAniSirGlobal mac_ctx,
+static void csr_update_bss_with_fils_data(struct mac_context *mac_ctx,
 					  struct scan_cache_entry *scan_entry,
 					  tSirBssDescription *bss_descr)
 {
@@ -2660,13 +2660,13 @@ static void csr_update_bss_with_fils_data(tpAniSirGlobal mac_ctx,
 		bss_descr->fils_info_element.is_fils_sk_supported = true;
 }
 #else
-static void csr_update_bss_with_fils_data(tpAniSirGlobal mac_ctx,
+static void csr_update_bss_with_fils_data(struct mac_context *mac_ctx,
 					  struct scan_cache_entry *scan_entry,
 					  tSirBssDescription *bss_descr)
 { }
 #endif
 
-static QDF_STATUS csr_fill_bss_from_scan_entry(tpAniSirGlobal mac_ctx,
+static QDF_STATUS csr_fill_bss_from_scan_entry(struct mac_context *mac_ctx,
 	struct scan_cache_entry *scan_entry,
 	struct tag_csrscan_result **p_result)
 {
@@ -2793,7 +2793,7 @@ static QDF_STATUS csr_fill_bss_from_scan_entry(tpAniSirGlobal mac_ctx,
 	return QDF_STATUS_SUCCESS;
 }
 
-static QDF_STATUS csr_parse_scan_list(tpAniSirGlobal mac_ctx,
+static QDF_STATUS csr_parse_scan_list(struct mac_context *mac_ctx,
 	struct scan_result_list *ret_list,
 	qdf_list_t *scan_list)
 {
@@ -2914,7 +2914,7 @@ static bool csr_remove_ap_due_to_rssi(qdf_list_t *list,
  *
  * Return: void
  */
-static void csr_filter_ap_due_to_rssi_reject(tpAniSirGlobal mac_ctx,
+static void csr_filter_ap_due_to_rssi_reject(struct mac_context *mac_ctx,
 	struct scan_result_list *scan_list)
 {
 	tListElem *cur_entry;
@@ -2949,7 +2949,7 @@ static void csr_filter_ap_due_to_rssi_reject(tpAniSirGlobal mac_ctx,
 
 }
 
-QDF_STATUS csr_scan_get_result(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_scan_get_result(struct mac_context *mac_ctx,
 			       tCsrScanResultFilter *pFilter,
 			       tScanResultHandle *results)
 {
@@ -3033,7 +3033,7 @@ error:
 	return status;
 }
 
-QDF_STATUS csr_scan_get_result_for_bssid(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_scan_get_result_for_bssid(struct mac_context *mac_ctx,
 					struct qdf_mac_addr *bssid,
 					tCsrScanResultInfo *res)
 {
@@ -3095,7 +3095,7 @@ free_filter:
 }
 
 static inline QDF_STATUS
-csr_flush_scan_results(tpAniSirGlobal mac_ctx,
+csr_flush_scan_results(struct mac_context *mac_ctx,
 	struct scan_filter *filter)
 {
 	struct wlan_objmgr_pdev *pdev = NULL;
@@ -3113,7 +3113,7 @@ csr_flush_scan_results(tpAniSirGlobal mac_ctx,
 	return status;
 }
 
-QDF_STATUS csr_scan_flush_result(tpAniSirGlobal mac_ctx)
+QDF_STATUS csr_scan_flush_result(struct mac_context *mac_ctx)
 {
 
 	if (csr_scan_flush_denied(mac_ctx)) {
@@ -3124,7 +3124,7 @@ QDF_STATUS csr_scan_flush_result(tpAniSirGlobal mac_ctx)
 	return csr_flush_scan_results(mac_ctx, NULL);
 }
 
-QDF_STATUS csr_scan_flush_selective_result(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_scan_flush_selective_result(struct mac_context *mac_ctx,
 	bool flush_p2p)
 {
 	struct scan_filter *filter;
@@ -3143,7 +3143,7 @@ end:
 	return status;
 }
 
-static inline void csr_flush_bssid(tpAniSirGlobal mac_ctx,
+static inline void csr_flush_bssid(struct mac_context *mac_ctx,
 	uint8_t *bssid)
 {
 	struct scan_filter *filter;
@@ -3162,20 +3162,20 @@ static inline void csr_flush_bssid(tpAniSirGlobal mac_ctx,
 		qdf_mem_free(filter);
 }
 
-void csr_scan_flush_bss_entry(tpAniSirGlobal mac_ctx,
+void csr_scan_flush_bss_entry(struct mac_context *mac_ctx,
 			tpSmeCsaOffloadInd csa_off_ind)
 {
 	csr_flush_bssid(mac_ctx,
 		csa_off_ind->bssid.bytes);
 }
 
-void csr_remove_bssid_from_scan_list(tpAniSirGlobal mac_ctx,
+void csr_remove_bssid_from_scan_list(struct mac_context *mac_ctx,
 			tSirMacAddr bssid)
 {
 	csr_flush_bssid(mac_ctx, bssid);
 }
 
-void csr_init_occupied_channels_list(tpAniSirGlobal mac_ctx,
+void csr_init_occupied_channels_list(struct mac_context *mac_ctx,
 	uint8_t sessionId)
 {
 	tScanResultHandle results;
@@ -3255,7 +3255,7 @@ void csr_init_occupied_channels_list(tpAniSirGlobal mac_ctx,
  *
  * return: QDF Status
  */
-QDF_STATUS csr_scan_filter_results(tpAniSirGlobal mac_ctx)
+QDF_STATUS csr_scan_filter_results(struct mac_context *mac_ctx)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	uint32_t len = sizeof(mac_ctx->roam.validChannelList);

core/sme/src/csr/csr_cmd_process.c

@@ -35,7 +35,7 @@
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS csr_msg_processor(tpAniSirGlobal mac_ctx, void *msg_buf)
+QDF_STATUS csr_msg_processor(struct mac_context *mac_ctx, void *msg_buf)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	tSirSmeRsp *sme_rsp = (tSirSmeRsp *) msg_buf;

core/sme/src/csr/csr_host_scan_roam.c

@@ -44,7 +44,7 @@
  *
  * Return: Success or Failure
  */
-QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_issue_reassociate(struct mac_context *mac,
 	uint32_t sessionId, tSirBssDescription *pSirBssDesc,
 	tDot11fBeaconIEs *pIes, struct csr_roam_profile *pProfile)
 {
@@ -66,7 +66,7 @@ QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal mac,
  *
  * Return: Success or Failure status
  */
-QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_issue_reassociate_cmd(struct mac_context *mac,
 		uint32_t sessionId)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
@@ -159,7 +159,7 @@ QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal mac,
  * Return: void
  */
 
-void csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
+void csr_neighbor_roam_process_scan_results(struct mac_context *mac_ctx,
 		uint8_t sessionid, tScanResultHandle *scan_results_list)
 {
 	tCsrScanResultInfo *scan_result;
@@ -382,7 +382,7 @@ void csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
  *
  * Return: None
  */
-void csr_neighbor_roam_trigger_handoff(tpAniSirGlobal mac_ctx,
+void csr_neighbor_roam_trigger_handoff(struct mac_context *mac_ctx,
 				      uint8_t session_id)
 {
 	if (csr_roam_is_fast_roam_enabled(mac_ctx, session_id))
@@ -398,7 +398,7 @@ void csr_neighbor_roam_trigger_handoff(tpAniSirGlobal mac_ctx,
  *
  * Return: Success or Failure
  */
-QDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal mac,
+QDF_STATUS csr_neighbor_roam_process_scan_complete(struct mac_context *mac,
 		uint8_t sessionId)
 {
 	tpCsrNeighborRoamControlInfo pNeighborRoamInfo =
@@ -466,7 +466,7 @@ QDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal mac,
  *
  * Return: QDF_STATUS_SUCCESS on success, corresponding error code otherwise
  */
-QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal mac,
+QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(struct mac_context *mac,
 		void *pMsg)
 {
 	tSirSmeCandidateFoundInd *pSirSmeCandidateFoundInd =
@@ -512,7 +512,7 @@ QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal mac,
  *
  * Return: none
  */
-void csr_neighbor_roam_free_roamable_bss_list(tpAniSirGlobal mac_ctx,
+void csr_neighbor_roam_free_roamable_bss_list(struct mac_context *mac_ctx,
 					      tDblLinkList *llist)
 {
 	tpCsrNeighborRoamBSSInfo result = NULL;
@@ -543,7 +543,7 @@ void csr_neighbor_roam_free_roamable_bss_list(tpAniSirGlobal mac_ctx,
  *
  * Return: true if successfully removed, else false
  */
-bool csr_neighbor_roam_remove_roamable_ap_list_entry(tpAniSirGlobal mac,
+bool csr_neighbor_roam_remove_roamable_ap_list_entry(struct mac_context *mac,
 						     tDblLinkList *pList,
 						     tpCsrNeighborRoamBSSInfo
 						     pNeighborEntry)
@@ -571,7 +571,7 @@ bool csr_neighbor_roam_remove_roamable_ap_list_entry(tpAniSirGlobal mac,
  * Return: Neighbor Roam BSS Node to be returned
  */
 tpCsrNeighborRoamBSSInfo csr_neighbor_roam_next_roamable_ap(
-				tpAniSirGlobal mac_ctx, tDblLinkList *llist,
+				struct mac_context *mac_ctx, tDblLinkList *llist,
 				tpCsrNeighborRoamBSSInfo neighbor_entry)
 {
 	tListElem *entry = NULL;
@@ -603,7 +603,7 @@ tpCsrNeighborRoamBSSInfo csr_neighbor_roam_next_roamable_ap(
  *
  * Return: none
  */
-void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx,
+void csr_neighbor_roam_request_handoff(struct mac_context *mac_ctx,
 		uint8_t session_id)
 {
 	struct csr_roam_info roam_info;
@@ -702,7 +702,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx,
  * Return: true if able find handoff AP, false otherwise
  */
 
-bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal mac,
+bool csr_neighbor_roam_get_handoff_ap_info(struct mac_context *mac,
 			tpCsrNeighborRoamBSSInfo hand_off_node,
 			uint8_t session_id)
 {
@@ -770,7 +770,7 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal mac,
  *
  * Return: true if reassoc in progress, false otherwise
  */
-bool csr_neighbor_roam_is_handoff_in_progress(tpAniSirGlobal mac,
+bool csr_neighbor_roam_is_handoff_in_progress(struct mac_context *mac,
 		uint8_t sessionId)
 {
 	if (eCSR_NEIGHBOR_ROAM_STATE_REASSOCIATING ==
@@ -791,7 +791,7 @@ bool csr_neighbor_roam_is_handoff_in_progress(tpAniSirGlobal mac,
  *
  * Return: None
  */
-void csr_neighbor_roam_free_neighbor_roam_bss_node(tpAniSirGlobal mac,
+void csr_neighbor_roam_free_neighbor_roam_bss_node(struct mac_context *mac,
 						   tpCsrNeighborRoamBSSInfo
 						   neighborRoamBSSNode)
 {

core/sme/src/csr/csr_inside_api.h

@@ -88,7 +88,7 @@
 #define CSR_MAX_BSSID_COUNT     (SME_ACTIVE_LIST_CMD_TIMEOUT_VALUE/3000) - 2
 #define CSR_CUSTOM_CONC_GO_BI    100
 extern uint8_t csr_wpa_oui[][CSR_WPA_OUI_SIZE];
-bool csr_is_supported_channel(tpAniSirGlobal mac, uint8_t channelId);
+bool csr_is_supported_channel(struct mac_context *mac, uint8_t channelId);
 
 enum csr_scancomplete_nextcommand {
 	eCsrNextScanNothing,
@@ -194,20 +194,20 @@ struct scan_result_list {
 					(eCsrForcedDisassocMICFailure == \
 					(pCommand)->u.roamCmd.roamReason)))
 
-enum csr_roam_state csr_roam_state_change(tpAniSirGlobal mac,
+enum csr_roam_state csr_roam_state_change(struct mac_context *mac,
 					  enum csr_roam_state NewRoamState,
 					  uint8_t sessionId);
-void csr_roaming_state_msg_processor(tpAniSirGlobal mac, void *pMsgBuf);
-void csr_roam_joined_state_msg_processor(tpAniSirGlobal mac, void *pMsgBuf);
+void csr_roaming_state_msg_processor(struct mac_context *mac, void *pMsgBuf);
+void csr_roam_joined_state_msg_processor(struct mac_context *mac, void *pMsgBuf);
 void csr_scan_callback(struct wlan_objmgr_vdev *vdev,
 				struct scan_event *event, void *arg);
-void csr_release_command_roam(tpAniSirGlobal mac, tSmeCmd *pCommand);
-void csr_release_command_wm_status_change(tpAniSirGlobal mac,
+void csr_release_command_roam(struct mac_context *mac, tSmeCmd *pCommand);
+void csr_release_command_wm_status_change(struct mac_context *mac,
 					  tSmeCmd *pCommand);
-void csr_release_roc_req_cmd(tpAniSirGlobal mac_ctx,
+void csr_release_roc_req_cmd(struct mac_context *mac_ctx,
 			     tSmeCmd *pCommand);
 
-QDF_STATUS csr_roam_save_connected_bss_desc(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_save_connected_bss_desc(struct mac_context *mac,
 					    uint32_t sessionId,
 					    tSirBssDescription *pBssDesc);
 bool csr_is_network_type_equal(tSirBssDescription *pSirBssDesc1,
@@ -218,25 +218,25 @@ bool csr_is_network_type_equal(tSirBssDescription *pSirBssDesc1,
  * pScanFilter when it is done with the filter.
  */
 QDF_STATUS
-csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac,
+csr_roam_prepare_filter_from_profile(struct mac_context *mac,
 				     struct csr_roam_profile *pProfile,
 				     tCsrScanResultFilter *pScanFilter);
 
-QDF_STATUS csr_roam_copy_profile(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_copy_profile(struct mac_context *mac,
 				 struct csr_roam_profile *pDstProfile,
 				 struct csr_roam_profile *pSrcProfile);
-QDF_STATUS csr_roam_start(tpAniSirGlobal mac);
-void csr_roam_stop(tpAniSirGlobal mac, uint32_t sessionId);
-void csr_roam_startMICFailureTimer(tpAniSirGlobal mac);
-void csr_roam_stopMICFailureTimer(tpAniSirGlobal mac);
-void csr_roam_startTKIPCounterMeasureTimer(tpAniSirGlobal mac);
-void csr_roam_stopTKIPCounterMeasureTimer(tpAniSirGlobal mac);
-
-QDF_STATUS csr_scan_open(tpAniSirGlobal mac);
-QDF_STATUS csr_scan_close(tpAniSirGlobal mac);
-bool csr_scan_append_bss_description(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_start(struct mac_context *mac);
+void csr_roam_stop(struct mac_context *mac, uint32_t sessionId);
+void csr_roam_startMICFailureTimer(struct mac_context *mac);
+void csr_roam_stopMICFailureTimer(struct mac_context *mac);
+void csr_roam_startTKIPCounterMeasureTimer(struct mac_context *mac);
+void csr_roam_stopTKIPCounterMeasureTimer(struct mac_context *mac);
+
+QDF_STATUS csr_scan_open(struct mac_context *mac);
+QDF_STATUS csr_scan_close(struct mac_context *mac);
+bool csr_scan_append_bss_description(struct mac_context *mac,
 				     tSirBssDescription *pSirBssDescription);
-QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_scan_for_ssid(struct mac_context *mac, uint32_t sessionId,
 			     struct csr_roam_profile *pProfile, uint32_t roamId,
 			     bool notify);
 /**
@@ -249,39 +249,39 @@ QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac, uint32_t sessionId,
  *
  * Return: 0 for success, non zero for failure
  */
-QDF_STATUS csr_scan_abort_mac_scan(tpAniSirGlobal mac, uint32_t vdev_id,
+QDF_STATUS csr_scan_abort_mac_scan(struct mac_context *mac, uint32_t vdev_id,
 				   uint32_t scan_id);
-QDF_STATUS csr_remove_nonscan_cmd_from_pending_list(tpAniSirGlobal mac,
+QDF_STATUS csr_remove_nonscan_cmd_from_pending_list(struct mac_context *mac,
 			uint8_t sessionId, eSmeCommandType commandType);
 
 /* If fForce is true we will save the new String that is learn't. */
 /* Typically it will be true in case of Join or user initiated ioctl */
-bool csr_learn_11dcountry_information(tpAniSirGlobal mac,
+bool csr_learn_11dcountry_information(struct mac_context *mac,
 				   tSirBssDescription *pSirBssDesc,
 				   tDot11fBeaconIEs *pIes, bool fForce);
-void csr_apply_country_information(tpAniSirGlobal mac);
-void csr_set_cfg_scan_control_list(tpAniSirGlobal mac, uint8_t *countryCode,
+void csr_apply_country_information(struct mac_context *mac);
+void csr_set_cfg_scan_control_list(struct mac_context *mac, uint8_t *countryCode,
 				   struct csr_channel *pChannelList);
-void csr_free_scan_result_entry(tpAniSirGlobal mac, struct tag_csrscan_result
+void csr_free_scan_result_entry(struct mac_context *mac, struct tag_csrscan_result
 				*pResult);
 
-QDF_STATUS csr_roam_call_callback(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_roam_call_callback(struct mac_context *mac, uint32_t sessionId,
 				  struct csr_roam_info *roam_info,
 				  uint32_t roamId,
 				  eRoamCmdStatus u1, eCsrRoamResult u2);
-QDF_STATUS csr_roam_issue_connect(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_roam_issue_connect(struct mac_context *mac, uint32_t sessionId,
 				  struct csr_roam_profile *pProfile,
 				  tScanResultHandle hBSSList,
 				  enum csr_roam_reason reason, uint32_t roamId,
 				  bool fImediate, bool fClearScan);
-QDF_STATUS csr_roam_issue_reassoc(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_roam_issue_reassoc(struct mac_context *mac, uint32_t sessionId,
 				  struct csr_roam_profile *pProfile,
 				 tCsrRoamModifyProfileFields *pModProfileFields,
 				  enum csr_roam_reason reason, uint32_t roamId,
 				  bool fImediate);
-void csr_roam_complete(tpAniSirGlobal mac, enum csr_roamcomplete_result Result,
+void csr_roam_complete(struct mac_context *mac, enum csr_roamcomplete_result Result,
 		       void *Context, uint8_t session_id);
-QDF_STATUS csr_roam_issue_set_context_req(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_issue_set_context_req(struct mac_context *mac,
 					uint32_t sessionId,
 					  eCsrEncryptionType EncryptType,
 					  tSirBssDescription *pBssDescription,
@@ -290,106 +290,106 @@ QDF_STATUS csr_roam_issue_set_context_req(tpAniSirGlobal mac,
 					  tAniKeyDirection aniKeyDirection,
 					  uint8_t keyId, uint16_t keyLength,
 					  uint8_t *pKey, uint8_t paeRole);
-QDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_process_disassoc_deauth(struct mac_context *mac,
 						tSmeCmd *pCommand,
 					    bool fDisassoc, bool fMICFailure);
-QDF_STATUS csr_roam_save_connected_information(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_save_connected_information(struct mac_context *mac,
 					      uint32_t sessionId,
 					      struct csr_roam_profile *pProfile,
 					      tSirBssDescription *pSirBssDesc,
 					      tDot11fBeaconIEs *pIes);
-void csr_roam_check_for_link_status_change(tpAniSirGlobal mac,
+void csr_roam_check_for_link_status_change(struct mac_context *mac,
 					tSirSmeRsp *pSirMsg);
 
 #ifndef QCA_SUPPORT_CP_STATS
-void csr_roam_stats_rsp_processor(tpAniSirGlobal mac, tSirSmeRsp *pSirMsg);
+void csr_roam_stats_rsp_processor(struct mac_context *mac, tSirSmeRsp *pSirMsg);
 #else
-static inline void csr_roam_stats_rsp_processor(tpAniSirGlobal mac,
+static inline void csr_roam_stats_rsp_processor(struct mac_context *mac,
 						tSirSmeRsp *pSirMsg) {}
 #endif /* QCA_SUPPORT_CP_STATS */
 
-QDF_STATUS csr_roam_issue_start_bss(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_roam_issue_start_bss(struct mac_context *mac, uint32_t sessionId,
 				    struct csr_roamstart_bssparams *pParam,
 				    struct csr_roam_profile *pProfile,
 				    tSirBssDescription *pBssDesc,
 					uint32_t roamId);
-QDF_STATUS csr_roam_issue_stop_bss(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_roam_issue_stop_bss(struct mac_context *mac, uint32_t sessionId,
 				   enum csr_roam_substate NewSubstate);
-bool csr_is_same_profile(tpAniSirGlobal mac, tCsrRoamConnectedProfile
+bool csr_is_same_profile(struct mac_context *mac, tCsrRoamConnectedProfile
 			*pProfile1, struct csr_roam_profile *pProfile2);
-bool csr_is_roam_command_waiting_for_session(tpAniSirGlobal mac,
+bool csr_is_roam_command_waiting_for_session(struct mac_context *mac,
 					uint32_t sessionId);
-eRoamCmdStatus csr_get_roam_complete_status(tpAniSirGlobal mac,
+eRoamCmdStatus csr_get_roam_complete_status(struct mac_context *mac,
 					    uint32_t sessionId);
 /* pBand can be NULL if caller doesn't need to get it */
-QDF_STATUS csr_roam_issue_disassociate_cmd(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_issue_disassociate_cmd(struct mac_context *mac,
 					uint32_t sessionId,
 					   eCsrRoamDisconnectReason reason);
-QDF_STATUS csr_roam_disconnect_internal(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_roam_disconnect_internal(struct mac_context *mac, uint32_t sessionId,
 					eCsrRoamDisconnectReason reason);
 /* pCommand may be NULL */
-void csr_roam_remove_duplicate_command(tpAniSirGlobal mac, uint32_t sessionId,
+void csr_roam_remove_duplicate_command(struct mac_context *mac, uint32_t sessionId,
 				       tSmeCmd *pCommand,
 				       enum csr_roam_reason eRoamReason);
 
-QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId,
 				 tSirBssDescription *pBssDescription,
 				 struct csr_roam_profile *pProfile,
 				 tDot11fBeaconIEs *pIes, uint16_t messageType);
-QDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_send_mb_disassoc_req_msg(struct mac_context *mac, uint32_t sessionId,
 					tSirMacAddr bssId, uint16_t reasonCode);
-QDF_STATUS csr_send_mb_deauth_req_msg(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_send_mb_deauth_req_msg(struct mac_context *mac, uint32_t sessionId,
 				      tSirMacAddr bssId, uint16_t reasonCode);
-QDF_STATUS csr_send_mb_disassoc_cnf_msg(tpAniSirGlobal mac,
+QDF_STATUS csr_send_mb_disassoc_cnf_msg(struct mac_context *mac,
 					tpSirSmeDisassocInd pDisassocInd);
-QDF_STATUS csr_send_mb_deauth_cnf_msg(tpAniSirGlobal mac,
+QDF_STATUS csr_send_mb_deauth_cnf_msg(struct mac_context *mac,
 				      tpSirSmeDeauthInd pDeauthInd);
-QDF_STATUS csr_send_assoc_cnf_msg(tpAniSirGlobal mac, tpSirSmeAssocInd
+QDF_STATUS csr_send_assoc_cnf_msg(struct mac_context *mac, tpSirSmeAssocInd
 				pAssocInd,
 				  QDF_STATUS status);
-QDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal mac,
+QDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(struct mac_context *mac,
 						     tpSirSmeAssocInd pAssocInd,
 						     QDF_STATUS Halstatus,
 						     uint8_t sessionId);
-QDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal mac,
+QDF_STATUS csr_send_mb_start_bss_req_msg(struct mac_context *mac,
 					uint32_t sessionId,
 					 eCsrRoamBssType bssType,
 					 struct csr_roamstart_bssparams *pParam,
 					 tSirBssDescription *pBssDesc);
-QDF_STATUS csr_send_mb_stop_bss_req_msg(tpAniSirGlobal mac,
+QDF_STATUS csr_send_mb_stop_bss_req_msg(struct mac_context *mac,
 					uint32_t sessionId);
 
 /* Caller should put the BSS' ssid to fiedl bssSsid when
  * comparing SSID for a BSS.
  */
-bool csr_is_ssid_match(tpAniSirGlobal mac, uint8_t *ssid1, uint8_t ssid1Len,
+bool csr_is_ssid_match(struct mac_context *mac, uint8_t *ssid1, uint8_t ssid1Len,
 		       uint8_t *bssSsid, uint8_t bssSsidLen,
 			bool fSsidRequired);
-bool csr_is_phy_mode_match(tpAniSirGlobal mac, uint32_t phyMode,
+bool csr_is_phy_mode_match(struct mac_context *mac, uint32_t phyMode,
 			   tSirBssDescription *pSirBssDesc,
 			   struct csr_roam_profile *pProfile,
 			   enum csr_cfgdot11mode *pReturnCfgDot11Mode,
 			   tDot11fBeaconIEs *pIes);
-bool csr_roam_is_channel_valid(tpAniSirGlobal mac, uint8_t channel);
+bool csr_roam_is_channel_valid(struct mac_context *mac, uint8_t channel);
 
 /* pNumChan is a caller allocated space with the sizeof pChannels */
-QDF_STATUS csr_get_cfg_valid_channels(tpAniSirGlobal mac, uint8_t *pChannels,
+QDF_STATUS csr_get_cfg_valid_channels(struct mac_context *mac, uint8_t *pChannels,
 				      uint32_t *pNumChan);
-int8_t csr_get_cfg_max_tx_power(tpAniSirGlobal mac, uint8_t channel);
+int8_t csr_get_cfg_max_tx_power(struct mac_context *mac, uint8_t channel);
 
 /* To free the last roaming profile */
-void csr_free_roam_profile(tpAniSirGlobal mac, uint32_t sessionId);
-void csr_free_connect_bss_desc(tpAniSirGlobal mac, uint32_t sessionId);
-QDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal mac,
+void csr_free_roam_profile(struct mac_context *mac, uint32_t sessionId);
+void csr_free_connect_bss_desc(struct mac_context *mac, uint32_t sessionId);
+QDF_STATUS csr_move_bss_to_head_from_bssid(struct mac_context *mac,
 					   struct qdf_mac_addr *bssid,
 					   tScanResultHandle hScanResult);
 
 /* to free memory allocated inside the profile structure */
-void csr_release_profile(tpAniSirGlobal mac,
+void csr_release_profile(struct mac_context *mac,
 			 struct csr_roam_profile *pProfile);
 
 /* To free memory allocated inside scanFilter */
-void csr_free_scan_filter(tpAniSirGlobal mac, tCsrScanResultFilter
+void csr_free_scan_filter(struct mac_context *mac, tCsrScanResultFilter
 			*pScanFilter);
 
 enum csr_cfgdot11mode
@@ -397,43 +397,43 @@ csr_get_cfg_dot11_mode_from_csr_phy_mode(struct csr_roam_profile *pProfile,
 					 eCsrPhyMode phyMode,
 					 bool fProprietary);
 
-uint32_t csr_translate_to_wni_cfg_dot11_mode(tpAniSirGlobal mac,
+uint32_t csr_translate_to_wni_cfg_dot11_mode(struct mac_context *mac,
 				    enum csr_cfgdot11mode csrDot11Mode);
-void csr_save_channel_power_for_band(tpAniSirGlobal mac, bool fPopulate5GBand);
-void csr_apply_channel_power_info_to_fw(tpAniSirGlobal mac,
+void csr_save_channel_power_for_band(struct mac_context *mac, bool fPopulate5GBand);
+void csr_apply_channel_power_info_to_fw(struct mac_context *mac,
 					struct csr_channel *pChannelList,
 					uint8_t *countryCode);
-void csr_apply_power2_current(tpAniSirGlobal mac);
-void csr_assign_rssi_for_category(tpAniSirGlobal mac, int8_t bestApRssi,
+void csr_apply_power2_current(struct mac_context *mac);
+void csr_assign_rssi_for_category(struct mac_context *mac, int8_t bestApRssi,
 				  uint8_t catOffset);
-QDF_STATUS csr_roam_start_roaming(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_roam_start_roaming(struct mac_context *mac, uint32_t sessionId,
 				  enum csr_roaming_reason roamingReason);
 /* return a bool to indicate whether roaming completed or continue. */
-bool csr_roam_complete_roaming(tpAniSirGlobal mac, uint32_t sessionId,
+bool csr_roam_complete_roaming(struct mac_context *mac, uint32_t sessionId,
 			       bool fForce, eCsrRoamResult roamResult);
-void csr_roam_completion(tpAniSirGlobal mac, uint32_t sessionId,
+void csr_roam_completion(struct mac_context *mac, uint32_t sessionId,
 			 struct csr_roam_info *roam_info, tSmeCmd *pCommand,
 			 eCsrRoamResult roamResult, bool fSuccess);
-void csr_roam_cancel_roaming(tpAniSirGlobal mac, uint32_t sessionId);
-void csr_apply_channel_power_info_wrapper(tpAniSirGlobal mac);
-void csr_reset_pmkid_candidate_list(tpAniSirGlobal mac, uint32_t sessionId);
+void csr_roam_cancel_roaming(struct mac_context *mac, uint32_t sessionId);
+void csr_apply_channel_power_info_wrapper(struct mac_context *mac);
+void csr_reset_pmkid_candidate_list(struct mac_context *mac, uint32_t sessionId);
 #ifdef FEATURE_WLAN_WAPI
-void csr_reset_bkid_candidate_list(tpAniSirGlobal mac, uint32_t sessionId);
+void csr_reset_bkid_candidate_list(struct mac_context *mac, uint32_t sessionId);
 #endif /* FEATURE_WLAN_WAPI */
-QDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal mac,
+QDF_STATUS csr_save_to_channel_power2_g_5_g(struct mac_context *mac,
 					uint32_t tableSize, tSirMacChanInfo
 					*channelTable);
-QDF_STATUS csr_roam_set_key(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_roam_set_key(struct mac_context *mac, uint32_t sessionId,
 			    tCsrRoamSetKey *pSetKey, uint32_t roamId);
-QDF_STATUS csr_roam_open_session(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_open_session(struct mac_context *mac,
 				 struct sme_session_params *session_param);
-QDF_STATUS csr_roam_close_session(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_roam_close_session(struct mac_context *mac_ctx,
 				  uint32_t session_id, bool sync);
-void csr_cleanup_session(tpAniSirGlobal mac, uint32_t sessionId);
-QDF_STATUS csr_roam_get_session_id_from_bssid(tpAniSirGlobal mac,
+void csr_cleanup_session(struct mac_context *mac, uint32_t sessionId);
+QDF_STATUS csr_roam_get_session_id_from_bssid(struct mac_context *mac,
 						struct qdf_mac_addr *bssid,
 					      uint32_t *pSessionId);
-enum csr_cfgdot11mode csr_find_best_phy_mode(tpAniSirGlobal mac,
+enum csr_cfgdot11mode csr_find_best_phy_mode(struct mac_context *mac,
 							uint32_t phyMode);
 
 /*
@@ -444,7 +444,7 @@ enum csr_cfgdot11mode csr_find_best_phy_mode(tpAniSirGlobal mac,
  * phResult - an object for the result.
  * Return QDF_STATUS
  */
-QDF_STATUS csr_scan_get_result(tpAniSirGlobal mac, tCsrScanResultFilter
+QDF_STATUS csr_scan_get_result(struct mac_context *mac, tCsrScanResultFilter
 				*pFilter, tScanResultHandle *phResult);
 
 /**
@@ -456,7 +456,7 @@ QDF_STATUS csr_scan_get_result(tpAniSirGlobal mac, tCsrScanResultFilter
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS csr_scan_get_result_for_bssid(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_scan_get_result_for_bssid(struct mac_context *mac_ctx,
 					 struct qdf_mac_addr *bssid,
 					 tCsrScanResultInfo *res);
 
@@ -468,7 +468,7 @@ QDF_STATUS csr_scan_get_result_for_bssid(tpAniSirGlobal mac_ctx,
  * sessionId - Session Identifier
  * Return QDF_STATUS
  */
-QDF_STATUS csr_scan_flush_result(tpAniSirGlobal mac_ctx);
+QDF_STATUS csr_scan_flush_result(struct mac_context *mac_ctx);
 /*
  * csr_scan_filter_results() -
  *  Filter scan results based on valid channel list.
@@ -476,9 +476,9 @@ QDF_STATUS csr_scan_flush_result(tpAniSirGlobal mac_ctx);
  * mac - Pointer to Global MAC structure
  * Return QDF_STATUS
  */
-QDF_STATUS csr_scan_filter_results(tpAniSirGlobal mac);
+QDF_STATUS csr_scan_filter_results(struct mac_context *mac);
 
-QDF_STATUS csr_scan_flush_selective_result(tpAniSirGlobal mac, bool flushP2P);
+QDF_STATUS csr_scan_flush_selective_result(struct mac_context *mac, bool flushP2P);
 
 /*
  * csr_scan_result_get_first
@@ -487,7 +487,7 @@ QDF_STATUS csr_scan_flush_selective_result(tpAniSirGlobal mac, bool flushP2P);
  * hScanResult - returned from csr_scan_get_result
  * tCsrScanResultInfo * - NULL if no result
  */
-tCsrScanResultInfo *csr_scan_result_get_first(tpAniSirGlobal mac,
+tCsrScanResultInfo *csr_scan_result_get_first(struct mac_context *mac,
 					      tScanResultHandle hScanResult);
 /*
  * csr_scan_result_get_next
@@ -497,7 +497,7 @@ tCsrScanResultInfo *csr_scan_result_get_first(tpAniSirGlobal mac,
  * hScanResult - returned from csr_scan_get_result
  * Return Null if no result or reach the end
  */
-tCsrScanResultInfo *csr_scan_result_get_next(tpAniSirGlobal mac,
+tCsrScanResultInfo *csr_scan_result_get_next(struct mac_context *mac,
 					     tScanResultHandle hScanResult);
 
 /*
@@ -509,7 +509,7 @@ tCsrScanResultInfo *csr_scan_result_get_next(tpAniSirGlobal mac,
  * success return, this contains the length of the data in pBuf
  * Return QDF_STATUS
  */
-QDF_STATUS csr_get_country_code(tpAniSirGlobal mac, uint8_t *pBuf,
+QDF_STATUS csr_get_country_code(struct mac_context *mac, uint8_t *pBuf,
 				uint8_t *pbLen);
 
 /*
@@ -525,32 +525,32 @@ QDF_STATUS csr_get_country_code(tpAniSirGlobal mac, uint8_t *pBuf,
  * source - the source of country information.
  * Return QDF_STATUS
  */
-QDF_STATUS csr_get_regulatory_domain_for_country(tpAniSirGlobal mac,
+QDF_STATUS csr_get_regulatory_domain_for_country(struct mac_context *mac,
 						 uint8_t *pCountry,
 						 v_REGDOMAIN_t *pDomainId,
 						 enum country_src source);
 
 /* some support functions */
-bool csr_is11d_supported(tpAniSirGlobal mac);
-bool csr_is11h_supported(tpAniSirGlobal mac);
-bool csr_is11e_supported(tpAniSirGlobal mac);
-bool csr_is_wmm_supported(tpAniSirGlobal mac);
-bool csr_is_mcc_supported(tpAniSirGlobal mac);
+bool csr_is11d_supported(struct mac_context *mac);
+bool csr_is11h_supported(struct mac_context *mac);
+bool csr_is11e_supported(struct mac_context *mac);
+bool csr_is_wmm_supported(struct mac_context *mac);
+bool csr_is_mcc_supported(struct mac_context *mac);
 
 /* Return SUCCESS is the command is queued, failed */
-QDF_STATUS csr_queue_sme_command(tpAniSirGlobal mac, tSmeCmd *pCommand,
+QDF_STATUS csr_queue_sme_command(struct mac_context *mac, tSmeCmd *pCommand,
 				 bool fHighPriority);
-tSmeCmd *csr_get_command_buffer(tpAniSirGlobal mac);
-void csr_release_command(tpAniSirGlobal mac, tSmeCmd *pCommand);
-void csr_release_command_buffer(tpAniSirGlobal mac, tSmeCmd *pCommand);
-void csr_scan_flush_bss_entry(tpAniSirGlobal mac,
+tSmeCmd *csr_get_command_buffer(struct mac_context *mac);
+void csr_release_command(struct mac_context *mac, tSmeCmd *pCommand);
+void csr_release_command_buffer(struct mac_context *mac, tSmeCmd *pCommand);
+void csr_scan_flush_bss_entry(struct mac_context *mac,
 			      tpSmeCsaOffloadInd pCsaOffloadInd);
 
 #ifdef FEATURE_WLAN_WAPI
 bool csr_is_profile_wapi(struct csr_roam_profile *pProfile);
 #endif /* FEATURE_WLAN_WAPI */
 
-void csr_get_vdev_type_nss(tpAniSirGlobal mac_ctx,
+void csr_get_vdev_type_nss(struct mac_context *mac_ctx,
 		enum QDF_OPMODE dev_mode,
 		uint8_t *nss_2g, uint8_t *nss_5g);
 
@@ -670,7 +670,7 @@ enum mgmt_bss_type diag_persona_from_csr_type(enum QDF_OPMODE persona);
  * gone by calling this function and even before this function reutrns.
  * Return QDF_STATUS
  */
-QDF_STATUS csr_scan_result_purge(tpAniSirGlobal mac,
+QDF_STATUS csr_scan_result_purge(struct mac_context *mac,
 				 tScanResultHandle hScanResult);
 
 /* /////////////////////////////////////////Common Scan ends */
@@ -682,7 +682,7 @@ QDF_STATUS csr_scan_result_purge(tpAniSirGlobal mac,
  * pRoamId - to get back the request ID
  * Return QDF_STATUS
  */
-QDF_STATUS csr_roam_connect(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_roam_connect(struct mac_context *mac, uint32_t sessionId,
 			    struct csr_roam_profile *pProfile,
 			    uint32_t *pRoamId);
 
@@ -698,7 +698,7 @@ QDF_STATUS csr_roam_connect(tpAniSirGlobal mac, uint32_t sessionId,
  * pRoamId - to get back the request ID
  * Return QDF_STATUS
  */
-QDF_STATUS csr_roam_reassoc(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_roam_reassoc(struct mac_context *mac, uint32_t sessionId,
 			    struct csr_roam_profile *pProfile,
 			    tCsrRoamModifyProfileFields modProfileFields,
 			    uint32_t *pRoamId);
@@ -709,7 +709,7 @@ QDF_STATUS csr_roam_reassoc(tpAniSirGlobal mac, uint32_t sessionId,
  *
  * Return QDF_STATUS. It returns fail if currently not connected
  */
-QDF_STATUS csr_roam_reconnect(tpAniSirGlobal mac, uint32_t sessionId);
+QDF_STATUS csr_roam_reconnect(struct mac_context *mac, uint32_t sessionId);
 
 /*
  * csr_roam_set_pmkid_cache() -
@@ -724,7 +724,7 @@ QDF_STATUS csr_roam_reconnect(tpAniSirGlobal mac, uint32_t sessionId);
  * \Note: pNumItems is a number of tPmkidCacheInfo, not
  * sizeof(tPmkidCacheInfo) * something
  */
-QDF_STATUS csr_roam_set_pmkid_cache(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_roam_set_pmkid_cache(struct mac_context *mac, uint32_t sessionId,
 				    tPmkidCacheInfo *pPMKIDCache,
 				   uint32_t numItems, bool update_entire_cache);
 
@@ -740,7 +740,7 @@ QDF_STATUS csr_roam_set_pmkid_cache(tpAniSirGlobal mac, uint32_t sessionId,
  *
  * Return: none
  */
-void csr_get_pmk_info(tpAniSirGlobal mac_ctx, uint8_t session_id,
+void csr_get_pmk_info(struct mac_context *mac_ctx, uint8_t session_id,
 		      tPmkidCacheInfo *pmk_cache);
 
 /*
@@ -752,10 +752,10 @@ void csr_get_pmk_info(tpAniSirGlobal mac_ctx, uint8_t session_id,
  * Return QDF_STATUS - usually it succeed unless sessionId is not found
  * Note:
  */
-QDF_STATUS csr_roam_set_psk_pmk(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_roam_set_psk_pmk(struct mac_context *mac, uint32_t sessionId,
 				uint8_t *pPSK_PMK, size_t pmk_len);
 
-QDF_STATUS csr_roam_set_key_mgmt_offload(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_roam_set_key_mgmt_offload(struct mac_context *mac_ctx,
 					 uint32_t session_id,
 					 bool roam_key_mgmt_offload_enabled,
 					 struct pmkid_mode_bits *pmkid_modes);
@@ -770,7 +770,7 @@ QDF_STATUS csr_roam_set_key_mgmt_offload(tpAniSirGlobal mac_ctx,
  * Return QDF_STATUS - when fail, it usually means the buffer allocated is not
  * big enough
  */
-QDF_STATUS csr_roam_get_wpa_rsn_req_ie(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_roam_get_wpa_rsn_req_ie(struct mac_context *mac, uint32_t sessionId,
 				       uint32_t *pLen, uint8_t *pBuf);
 
 /*
@@ -783,7 +783,7 @@ QDF_STATUS csr_roam_get_wpa_rsn_req_ie(tpAniSirGlobal mac, uint32_t sessionId,
  * Return QDF_STATUS - when fail, it usually means the buffer allocated is not
  * big enough
  */
-QDF_STATUS csr_roam_get_wpa_rsn_rsp_ie(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_roam_get_wpa_rsn_rsp_ie(struct mac_context *mac, uint32_t sessionId,
 				       uint32_t *pLen, uint8_t *pBuf);
 
 /*
@@ -792,7 +792,7 @@ QDF_STATUS csr_roam_get_wpa_rsn_rsp_ie(tpAniSirGlobal mac, uint32_t sessionId,
  *
  * Return uint32_t - the number of PMKID cache entries
  */
-uint32_t csr_roam_get_num_pmkid_cache(tpAniSirGlobal mac, uint32_t sessionId);
+uint32_t csr_roam_get_num_pmkid_cache(struct mac_context *mac, uint32_t sessionId);
 
 /*
  * csr_roam_get_pmkid_cache() -
@@ -806,7 +806,7 @@ uint32_t csr_roam_get_num_pmkid_cache(tpAniSirGlobal mac, uint32_t sessionId);
  * Return QDF_STATUS - when fail, it usually means the buffer allocated is
  * not big enough
  */
-QDF_STATUS csr_roam_get_pmkid_cache(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_roam_get_pmkid_cache(struct mac_context *mac, uint32_t sessionId,
 				  uint32_t *pNum, tPmkidCacheInfo *pPmkidCache);
 
 /**
@@ -821,7 +821,7 @@ QDF_STATUS csr_roam_get_pmkid_cache(tpAniSirGlobal mac, uint32_t sessionId,
  *
  * Return: QDF_STATUS. Failure if not connected, success otherwise
  */
-QDF_STATUS csr_roam_get_connect_profile(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_roam_get_connect_profile(struct mac_context *mac, uint32_t sessionId,
 					tCsrRoamConnectedProfile *pProfile);
 
 /*
@@ -830,7 +830,7 @@ QDF_STATUS csr_roam_get_connect_profile(tpAniSirGlobal mac, uint32_t sessionId,
  *
  * Return QDF_STATUS
  */
-QDF_STATUS csr_roam_get_connect_state(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_roam_get_connect_state(struct mac_context *mac, uint32_t sessionId,
 				      eCsrConnectState *pState);
 
 void csr_roam_free_connect_profile(tCsrRoamConnectedProfile *profile);
@@ -843,7 +843,7 @@ void csr_roam_free_connect_profile(tCsrRoamConnectedProfile *profile);
 
  * Return QDF_STATUS
  */
-QDF_STATUS csr_apply_channel_and_power_list(tpAniSirGlobal mac);
+QDF_STATUS csr_apply_channel_and_power_list(struct mac_context *mac);
 
 /*
  * csr_roam_connect_to_last_profile() -
@@ -851,7 +851,7 @@ QDF_STATUS csr_apply_channel_and_power_list(tpAniSirGlobal mac);
  *
  * Return QDF_STATUS. It returns fail if currently connected
  */
-QDF_STATUS csr_roam_connect_to_last_profile(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_connect_to_last_profile(struct mac_context *mac,
 					uint32_t sessionId);
 
 /*
@@ -862,17 +862,17 @@ QDF_STATUS csr_roam_connect_to_last_profile(tpAniSirGlobal mac,
  * eCSR_DISCONNECT_REASON_MIC_ERROR is meanful.
  * Return QDF_STATUS
  */
-QDF_STATUS csr_roam_disconnect(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_roam_disconnect(struct mac_context *mac, uint32_t sessionId,
 			       eCsrRoamDisconnectReason reason);
 
 /* This function is used to stop a BSS. It is similar of csr_roamIssueDisconnect
  * but this function doesn't have any logic other than blindly trying to stop
  * BSS
  */
-QDF_STATUS csr_roam_issue_stop_bss_cmd(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_roam_issue_stop_bss_cmd(struct mac_context *mac, uint32_t sessionId,
 				       bool fHighPriority);
 
-void csr_call_roaming_completion_callback(tpAniSirGlobal mac,
+void csr_call_roaming_completion_callback(struct mac_context *mac,
 					  struct csr_roam_session *pSession,
 					  struct csr_roam_info *roam_info,
 					  uint32_t roamId,
@@ -887,7 +887,7 @@ void csr_call_roaming_completion_callback(tpAniSirGlobal mac,
  *
  * Return: QDF_STATUS_SUCCESS on success or another QDF_STATUS_* on error
  */
-QDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_issue_disassociate_sta_cmd(struct mac_context *mac,
 					       uint32_t sessionId,
 					       struct csr_del_sta_params
 					       *p_del_sta_params);
@@ -901,7 +901,7 @@ QDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal mac,
  *
  * Return: QDF_STATUS_SUCCESS on success or another QDF_STATUS_** on error
  */
-QDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal mac,
+QDF_STATUS csr_roam_issue_deauth_sta_cmd(struct mac_context *mac,
 		uint32_t sessionId,
 		struct csr_del_sta_params *pDelStaParams);
 
@@ -917,12 +917,12 @@ QDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal mac,
  * stations info
  * Return QDF_STATUS
  */
-QDF_STATUS csr_roam_get_associated_stas(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_roam_get_associated_stas(struct mac_context *mac, uint32_t sessionId,
 					QDF_MODULE_ID modId, void *pUsrContext,
 					void *pfnSapEventCallback,
 					uint8_t *pAssocStasBuf);
 
-QDF_STATUS csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal mac,
+QDF_STATUS csr_send_mb_get_associated_stas_req_msg(struct mac_context *mac,
 						   uint32_t sessionId,
 						   QDF_MODULE_ID modId,
 						   struct qdf_mac_addr bssId,
@@ -938,7 +938,7 @@ QDF_STATUS csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal mac,
  * Return QDF_STATUS
  */
 QDF_STATUS
-csr_send_chng_mcc_beacon_interval(tpAniSirGlobal mac, uint32_t sessionId);
+csr_send_chng_mcc_beacon_interval(struct mac_context *mac, uint32_t sessionId);
 
 /**
  * csr_roam_ft_pre_auth_rsp_processor() - Handle the preauth response
@@ -948,11 +948,11 @@ csr_send_chng_mcc_beacon_interval(tpAniSirGlobal mac, uint32_t sessionId);
  * Return: None
  */
 #ifdef WLAN_FEATURE_HOST_ROAM
-void csr_roam_ft_pre_auth_rsp_processor(tpAniSirGlobal mac_ctx,
+void csr_roam_ft_pre_auth_rsp_processor(struct mac_context *mac_ctx,
 					tpSirFTPreAuthRsp pFTPreAuthRsp);
 #else
 static inline
-void csr_roam_ft_pre_auth_rsp_processor(tpAniSirGlobal mac_ctx,
+void csr_roam_ft_pre_auth_rsp_processor(struct mac_context *mac_ctx,
 					tpSirFTPreAuthRsp pFTPreAuthRsp)
 {}
 #endif
@@ -962,37 +962,37 @@ void update_cckmtsf(uint32_t *timeStamp0, uint32_t *timeStamp1,
 		    uint64_t *incr);
 #endif
 
-QDF_STATUS csr_roam_enqueue_preauth(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_roam_enqueue_preauth(struct mac_context *mac, uint32_t sessionId,
 			    tpSirBssDescription pBssDescription,
 			    enum csr_roam_reason reason, bool fImmediate);
-QDF_STATUS csr_dequeue_roam_command(tpAniSirGlobal mac,
+QDF_STATUS csr_dequeue_roam_command(struct mac_context *mac,
 				enum csr_roam_reason reason,
 				uint8_t session_id);
-void csr_init_occupied_channels_list(tpAniSirGlobal mac, uint8_t sessionId);
-bool csr_neighbor_roam_is_new_connected_profile(tpAniSirGlobal mac,
+void csr_init_occupied_channels_list(struct mac_context *mac, uint8_t sessionId);
+bool csr_neighbor_roam_is_new_connected_profile(struct mac_context *mac,
 						uint8_t sessionId);
-bool csr_neighbor_roam_connected_profile_match(tpAniSirGlobal mac,
+bool csr_neighbor_roam_connected_profile_match(struct mac_context *mac,
 					       uint8_t sessionId,
 					       struct tag_csrscan_result
 						*pResult,
 					       tDot11fBeaconIEs *pIes);
 
-QDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal mac,
+QDF_STATUS csr_scan_create_entry_in_scan_cache(struct mac_context *mac,
 						uint32_t sessionId,
 						struct qdf_mac_addr bssid,
 						uint8_t channel);
 
-QDF_STATUS csr_update_channel_list(tpAniSirGlobal mac);
-QDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal mac,
+QDF_STATUS csr_update_channel_list(struct mac_context *mac);
+QDF_STATUS csr_roam_del_pmkid_from_cache(struct mac_context *mac,
 					 uint32_t sessionId,
 					 tPmkidCacheInfo *pmksa,
 					 bool flush_cache);
 
-bool csr_elected_country_info(tpAniSirGlobal mac);
-void csr_add_vote_for_country_info(tpAniSirGlobal mac, uint8_t *pCountryCode);
-void csr_clear_votes_for_country_info(tpAniSirGlobal mac);
+bool csr_elected_country_info(struct mac_context *mac);
+void csr_add_vote_for_country_info(struct mac_context *mac, uint8_t *pCountryCode);
+void csr_clear_votes_for_country_info(struct mac_context *mac);
 
-QDF_STATUS csr_send_ext_change_channel(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_send_ext_change_channel(struct mac_context *mac_ctx,
 				uint32_t channel, uint8_t session_id);
 #ifdef CONFIG_VDEV_SM
 /**
@@ -1002,38 +1002,38 @@ QDF_STATUS csr_send_ext_change_channel(tpAniSirGlobal mac_ctx,
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS csr_csa_restart(tpAniSirGlobal mac_ctx, uint8_t session_id);
+QDF_STATUS csr_csa_restart(struct mac_context *mac_ctx, uint8_t session_id);
 #endif
 
 
 #ifdef QCA_HT_2040_COEX
-QDF_STATUS csr_set_ht2040_mode(tpAniSirGlobal mac, uint32_t sessionId,
+QDF_STATUS csr_set_ht2040_mode(struct mac_context *mac, uint32_t sessionId,
 			       ePhyChanBondState cbMode, bool obssEnabled);
 #endif
-QDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_scan_handle_search_for_ssid(struct mac_context *mac_ctx,
 					   uint32_t session_id);
-QDF_STATUS csr_scan_handle_search_for_ssid_failure(tpAniSirGlobal mac,
+QDF_STATUS csr_scan_handle_search_for_ssid_failure(struct mac_context *mac,
 		uint32_t session_id);
-void csr_saved_scan_cmd_free_fields(tpAniSirGlobal mac_ctx,
+void csr_saved_scan_cmd_free_fields(struct mac_context *mac_ctx,
 				    struct csr_roam_session *session);
 tpSirBssDescription csr_get_fst_bssdescr_ptr(tScanResultHandle result_handle);
 
 tSirBssDescription*
 csr_get_bssdescr_from_scan_handle(tScanResultHandle result_handle,
 				  tSirBssDescription *bss_descr);
-bool is_disconnect_pending(tpAniSirGlobal mac_ctx,
+bool is_disconnect_pending(struct mac_context *mac_ctx,
 				   uint8_t sessionid);
 void csr_scan_active_list_timeout_handle(void *userData);
-QDF_STATUS csr_prepare_disconnect_command(tpAniSirGlobal mac,
+QDF_STATUS csr_prepare_disconnect_command(struct mac_context *mac,
 			uint32_t session_id, tSmeCmd **sme_cmd);
 
 QDF_STATUS
-csr_roam_prepare_bss_config_from_profile(tpAniSirGlobal mac_ctx,
+csr_roam_prepare_bss_config_from_profile(struct mac_context *mac_ctx,
 					 struct csr_roam_profile *profile,
 					 struct bss_config_param *bss_cfg,
 					 tSirBssDescription *bss_desc);
 
-void csr_roam_prepare_bss_params(tpAniSirGlobal mac_ctx, uint32_t session_id,
+void csr_roam_prepare_bss_params(struct mac_context *mac_ctx, uint32_t session_id,
 		struct csr_roam_profile *profile, tSirBssDescription *bss_desc,
 		struct bss_config_param *bss_cfg, tDot11fBeaconIEs *ies);
 
@@ -1047,15 +1047,15 @@ void csr_roam_prepare_bss_params(tpAniSirGlobal mac_ctx, uint32_t session_id,
  *
  * Return: void.
  */
-void csr_remove_bssid_from_scan_list(tpAniSirGlobal mac_ctx,
+void csr_remove_bssid_from_scan_list(struct mac_context *mac_ctx,
 	tSirMacAddr bssid);
 
-QDF_STATUS csr_roam_set_bss_config_cfg(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_roam_set_bss_config_cfg(struct mac_context *mac_ctx,
 		uint32_t session_id,
 		struct csr_roam_profile *profile, tSirBssDescription *bss_desc,
 		struct bss_config_param *bss_cfg, tDot11fBeaconIEs *ies,
 		bool reset_country);
-void csr_prune_channel_list_for_mode(tpAniSirGlobal mac,
+void csr_prune_channel_list_for_mode(struct mac_context *mac,
 				     struct csr_channel *pChannelList);
 
 #ifdef WLAN_FEATURE_11W
@@ -1088,15 +1088,15 @@ enum band_info csr_get_rf_band(uint8_t channel);
  *
  * Return: true if pmkid is found else false
  */
-bool csr_lookup_pmkid_using_bssid(tpAniSirGlobal mac,
+bool csr_lookup_pmkid_using_bssid(struct mac_context *mac,
 					struct csr_roam_session *session,
 					tPmkidCacheInfo *pmk_cache,
 					uint32_t *index);
 #ifdef WLAN_FEATURE_11AX
-void csr_update_session_he_cap(tpAniSirGlobal mac_ctx,
+void csr_update_session_he_cap(struct mac_context *mac_ctx,
 			struct csr_roam_session *session);
 #else
-static inline void csr_update_session_he_cap(tpAniSirGlobal mac_ctx,
+static inline void csr_update_session_he_cap(struct mac_context *mac_ctx,
 			struct csr_roam_session *session)
 {
 }
@@ -1118,7 +1118,7 @@ static inline void csr_update_session_he_cap(tpAniSirGlobal mac_ctx,
  * means no HW mode change is needed.
  */
 uint8_t
-csr_get_channel_for_hw_mode_change(tpAniSirGlobal mac_ctx,
+csr_get_channel_for_hw_mode_change(struct mac_context *mac_ctx,
 				   tScanResultHandle result_handle,
 				   uint32_t session_id);
 
@@ -1142,7 +1142,7 @@ csr_get_channel_for_hw_mode_change(tpAniSirGlobal mac_ctx,
  */
 uint8_t
 csr_scan_get_channel_for_hw_mode_change(
-	tpAniSirGlobal mac_ctx, uint32_t session_id,
+	struct mac_context *mac_ctx, uint32_t session_id,
 	struct csr_roam_profile *profile);
 
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
@@ -1157,7 +1157,7 @@ csr_scan_get_channel_for_hw_mode_change(
  *
  * Returns: None (information gets populated in buffer)
  */
-void csr_get_sta_cxn_info(tpAniSirGlobal mac_ctx,
+void csr_get_sta_cxn_info(struct mac_context *mac_ctx,
 			  struct csr_roam_session *session,
 			  struct tagCsrRoamConnectedProfile *conn_profile,
 			  char *buf, uint32_t buf_sz);

core/sme/src/csr/csr_neighbor_roam.c

@@ -52,7 +52,7 @@ static const char *lfr_get_config_item_string(uint8_t reason)
 static void csr_neighbor_roam_reset_channel_info(tpCsrNeighborRoamChannelInfo
 						 rChInfo);
 
-void csr_neighbor_roam_state_transition(tpAniSirGlobal mac_ctx,
+void csr_neighbor_roam_state_transition(struct mac_context *mac_ctx,
 		uint8_t newstate, uint8_t session)
 {
 	mac_ctx->roam.neighborRoamInfo[session].prevNeighborRoamState =
@@ -95,7 +95,7 @@ uint8_t *csr_neighbor_roam_state_to_string(uint8_t state)
  */
 
 void csr_neighbor_roam_send_lfr_metric_event(
-				tpAniSirGlobal mac_ctx,
+				struct mac_context *mac_ctx,
 				uint8_t session_id,
 				tSirMacAddr bssid,
 				eRoamCmdStatus status)
@@ -123,7 +123,7 @@ void csr_neighbor_roam_send_lfr_metric_event(
  *
  * Return: None
  */
-QDF_STATUS csr_neighbor_roam_update_fast_roaming_enabled(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_neighbor_roam_update_fast_roaming_enabled(struct mac_context *mac_ctx,
 						uint8_t session_id,
 						const bool fast_roam_enabled)
 {
@@ -161,7 +161,7 @@ QDF_STATUS csr_neighbor_roam_update_fast_roaming_enabled(tpAniSirGlobal mac_ctx,
 	}
 	return qdf_status;
 }
-QDF_STATUS csr_neighbor_roam_update_config(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_neighbor_roam_update_config(struct mac_context *mac_ctx,
 		uint8_t session_id, uint8_t value, uint8_t reason)
 {
 	tpCsrNeighborRoamControlInfo pNeighborRoamInfo =
@@ -263,7 +263,7 @@ static void csr_neighbor_roam_reset_channel_info(tpCsrNeighborRoamChannelInfo
  * Return: None
  */
 static void csr_neighbor_roam_reset_connected_state_control_info(
-							tpAniSirGlobal mac,
+							struct mac_context *mac,
 							uint8_t sessionId)
 {
 	tpCsrNeighborRoamControlInfo pNeighborRoamInfo =
@@ -289,7 +289,7 @@ static void csr_neighbor_roam_reset_connected_state_control_info(
 }
 
 static void csr_neighbor_roam_reset_report_scan_state_control_info(
-							tpAniSirGlobal mac,
+							struct mac_context *mac,
 							uint8_t sessionId)
 {
 	tpCsrNeighborRoamControlInfo pNeighborRoamInfo =
@@ -319,7 +319,7 @@ static void csr_neighbor_roam_reset_report_scan_state_control_info(
  *
  * Return: None
  */
-static void csr_neighbor_roam_reset_init_state_control_info(tpAniSirGlobal mac,
+static void csr_neighbor_roam_reset_init_state_control_info(struct mac_context *mac,
 							    uint8_t sessionId)
 {
 	csr_neighbor_roam_reset_connected_state_control_info(mac, sessionId);
@@ -343,7 +343,7 @@ static void csr_neighbor_roam_reset_init_state_control_info(tpAniSirGlobal mac,
  * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise
  */
 QDF_STATUS
-csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal mac,
+csr_neighbor_roam_prepare_scan_profile_filter(struct mac_context *mac,
 					      tCsrScanResultFilter *pScanFilter,
 					      uint8_t sessionId)
 {
@@ -510,7 +510,7 @@ enum band_info csr_get_rf_band(uint8_t channel)
  *
  * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise
  */
-QDF_STATUS csr_neighbor_roam_channels_filter_by_current_band(tpAniSirGlobal
+QDF_STATUS csr_neighbor_roam_channels_filter_by_current_band(struct mac_context *
 						mac,
 						uint8_t sessionId,
 						uint8_t *pInputChannelList,
@@ -572,7 +572,7 @@ QDF_STATUS csr_neighbor_roam_channels_filter_by_current_band(tpAniSirGlobal
  *
  * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise
  */
-QDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal mac,
+QDF_STATUS csr_neighbor_roam_merge_channel_lists(struct mac_context *mac,
 						 uint8_t *pInputChannelList,
 						 uint8_t inputNumOfChannels,
 						 uint8_t *pOutputChannelList,
@@ -650,7 +650,7 @@ QDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal mac,
  *
  * Return: bool
  */
-static bool csr_neighbor_roam_is_ssid_and_security_match(tpAniSirGlobal mac,
+static bool csr_neighbor_roam_is_ssid_and_security_match(struct mac_context *mac,
 		tCsrRoamConnectedProfile *pCurProfile,
 		tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes,
 		uint8_t session_id)
@@ -710,7 +710,7 @@ static bool csr_neighbor_roam_is_ssid_and_security_match(tpAniSirGlobal mac,
 
 }
 
-bool csr_neighbor_roam_is_new_connected_profile(tpAniSirGlobal mac,
+bool csr_neighbor_roam_is_new_connected_profile(struct mac_context *mac,
 						uint8_t sessionId)
 {
 	tpCsrNeighborRoamControlInfo pNeighborRoamInfo =
@@ -749,7 +749,7 @@ bool csr_neighbor_roam_is_new_connected_profile(tpAniSirGlobal mac,
 	return fNew;
 }
 
-bool csr_neighbor_roam_connected_profile_match(tpAniSirGlobal mac,
+bool csr_neighbor_roam_connected_profile_match(struct mac_context *mac,
 					       uint8_t sessionId,
 					       struct tag_csrscan_result
 						*pResult,
@@ -781,7 +781,7 @@ bool csr_neighbor_roam_connected_profile_match(tpAniSirGlobal mac,
  *
  * Return: VOID
  */
-void csr_roam_reset_roam_params(tpAniSirGlobal mac_ctx)
+void csr_roam_reset_roam_params(struct mac_context *mac_ctx)
 {
 	struct roam_ext_params *roam_params = NULL;
 
@@ -809,7 +809,7 @@ void csr_roam_reset_roam_params(tpAniSirGlobal mac_ctx)
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal mac,
+QDF_STATUS csr_neighbor_roam_indicate_disconnect(struct mac_context *mac,
 						 uint8_t sessionId)
 {
 	tpCsrNeighborRoamControlInfo pNeighborRoamInfo =
@@ -948,7 +948,7 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal mac,
  * Return: QDF status
  */
 static void csr_neighbor_roam_info_ctx_init(
-		tpAniSirGlobal mac,
+		struct mac_context *mac,
 		uint8_t session_id)
 {
 	tpCsrNeighborRoamControlInfo ngbr_roam_info =
@@ -1076,7 +1076,7 @@ static void csr_neighbor_roam_info_ctx_init(
  * Return: QDF status
  */
 QDF_STATUS csr_neighbor_roam_indicate_connect(
-		tpAniSirGlobal mac, uint8_t session_id,
+		struct mac_context *mac, uint8_t session_id,
 		QDF_STATUS qdf_status)
 {
 	tpCsrNeighborRoamControlInfo ngbr_roam_info =
@@ -1170,7 +1170,7 @@ QDF_STATUS csr_neighbor_roam_indicate_connect(
  *
  * return QDF_STATUS_SUCCESS on success, corresponding error code otherwise
  */
-static QDF_STATUS csr_neighbor_roam_init11r_assoc_info(tpAniSirGlobal mac)
+static QDF_STATUS csr_neighbor_roam_init11r_assoc_info(struct mac_context *mac)
 {
 	QDF_STATUS status;
 	uint8_t i;
@@ -1216,7 +1216,7 @@ static QDF_STATUS csr_neighbor_roam_init11r_assoc_info(tpAniSirGlobal mac)
  *
  * Return QDF_STATUS_SUCCESS on success, corresponding error code otherwise
  */
-QDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal mac, uint8_t sessionId)
+QDF_STATUS csr_neighbor_roam_init(struct mac_context *mac, uint8_t sessionId)
 {
 	QDF_STATUS status;
 	tpCsrNeighborRoamControlInfo pNeighborRoamInfo =
@@ -1345,7 +1345,7 @@ QDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal mac, uint8_t sessionId)
  *
  * Return VOID
  */
-void csr_neighbor_roam_close(tpAniSirGlobal mac, uint8_t sessionId)
+void csr_neighbor_roam_close(struct mac_context *mac, uint8_t sessionId)
 {
 	tpCsrNeighborRoamControlInfo pNeighborRoamInfo =
 		&mac->roam.neighborRoamInfo[sessionId];
@@ -1409,7 +1409,7 @@ void csr_neighbor_roam_close(tpAniSirGlobal mac, uint8_t sessionId)
  *
  * Return: true if 11r Association, false otherwise.
  */
-bool csr_neighbor_roam_is11r_assoc(tpAniSirGlobal mac_ctx, uint8_t session_id)
+bool csr_neighbor_roam_is11r_assoc(struct mac_context *mac_ctx, uint8_t session_id)
 {
 	return mac_ctx->roam.neighborRoamInfo[session_id].is11rAssoc;
 }
@@ -1423,7 +1423,7 @@ bool csr_neighbor_roam_is11r_assoc(tpAniSirGlobal mac_ctx, uint8_t session_id)
  *
  * Return bool
  */
-bool csr_neighbor_middle_of_roaming(tpAniSirGlobal mac, uint8_t sessionId)
+bool csr_neighbor_middle_of_roaming(struct mac_context *mac, uint8_t sessionId)
 {
 	tpCsrNeighborRoamControlInfo pNeighborRoamInfo =
 		&mac->roam.neighborRoamInfo[sessionId];
@@ -1448,7 +1448,7 @@ bool csr_neighbor_middle_of_roaming(tpAniSirGlobal mac, uint8_t sessionId)
  * Return: status
  */
 static QDF_STATUS csr_neighbor_roam_process_handoff_req(
-			tpAniSirGlobal mac_ctx,
+			struct mac_context *mac_ctx,
 			uint8_t session_id)
 {
 	tpCsrNeighborRoamControlInfo roam_ctrl_info =
@@ -1562,7 +1562,7 @@ end:
  *
  * Return QDF_STATUS_SUCCESS on success, corresponding error code otherwise
  */
-QDF_STATUS csr_neighbor_roam_sssid_scan_done(tpAniSirGlobal mac,
+QDF_STATUS csr_neighbor_roam_sssid_scan_done(struct mac_context *mac,
 					   uint8_t sessionId, QDF_STATUS status)
 {
 	tpCsrNeighborRoamControlInfo pNeighborRoamInfo =
@@ -1618,7 +1618,7 @@ QDF_STATUS csr_neighbor_roam_sssid_scan_done(tpAniSirGlobal mac,
  * Return: status
  */
 QDF_STATUS csr_neighbor_roam_handoff_req_hdlr(
-			tpAniSirGlobal mac_ctx, void *msg)
+			struct mac_context *mac_ctx, void *msg)
 {
 	tAniHandoffReq *handoff_req = (tAniHandoffReq *) msg;
 	uint32_t session_id = handoff_req->sessionId;
@@ -1675,7 +1675,7 @@ QDF_STATUS csr_neighbor_roam_handoff_req_hdlr(
  *
  * Return: QDF_STATUS_SUCCESS on success, corresponding error code otherwise
  */
-QDF_STATUS csr_neighbor_roam_proceed_with_handoff_req(tpAniSirGlobal mac,
+QDF_STATUS csr_neighbor_roam_proceed_with_handoff_req(struct mac_context *mac,
 						      uint8_t sessionId)
 {
 	tpCsrNeighborRoamControlInfo pNeighborRoamInfo =
@@ -1711,7 +1711,7 @@ QDF_STATUS csr_neighbor_roam_proceed_with_handoff_req(tpAniSirGlobal mac,
  *
  * Return QDF_STATUS_SUCCESS on success, corresponding error code otherwise
  */
-QDF_STATUS csr_neighbor_roam_start_lfr_scan(tpAniSirGlobal mac,
+QDF_STATUS csr_neighbor_roam_start_lfr_scan(struct mac_context *mac,
 						uint8_t sessionId)
 {
 	tpCsrNeighborRoamControlInfo pNeighborRoamInfo =

core/sme/src/csr/csr_roam_preauth.c

@@ -35,7 +35,7 @@
 #include "wlan_policy_mgr_api.h"
 #include "sir_api.h"
 
-static QDF_STATUS csr_neighbor_roam_add_preauth_fail(tpAniSirGlobal mac_ctx,
+static QDF_STATUS csr_neighbor_roam_add_preauth_fail(struct mac_context *mac_ctx,
 			uint8_t session_id, tSirMacAddr bssid);
 
 /**
@@ -45,7 +45,7 @@ static QDF_STATUS csr_neighbor_roam_add_preauth_fail(tpAniSirGlobal mac_ctx,
  *
  * Return: True if the state id preauth done, false otherwise
  */
-bool csr_neighbor_roam_state_preauth_done(tpAniSirGlobal mac_ctx,
+bool csr_neighbor_roam_state_preauth_done(struct mac_context *mac_ctx,
 		uint8_t session_id)
 {
 	return mac_ctx->roam.neighborRoamInfo[session_id].neighborRoamState ==
@@ -68,7 +68,7 @@ bool csr_neighbor_roam_state_preauth_done(tpAniSirGlobal mac_ctx,
  * Return: None
  */
 void csr_neighbor_roam_tranistion_preauth_done_to_disconnected(
-		tpAniSirGlobal mac_ctx, uint8_t session_id)
+		struct mac_context *mac_ctx, uint8_t session_id)
 {
 	tpCsrNeighborRoamControlInfo pNeighborRoamInfo =
 		&mac_ctx->roam.neighborRoamInfo[session_id];
@@ -101,7 +101,7 @@ void csr_neighbor_roam_tranistion_preauth_done_to_disconnected(
  *
  * Return: Success if queued properly, false otherwise.
  */
-QDF_STATUS csr_roam_enqueue_preauth(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_roam_enqueue_preauth(struct mac_context *mac_ctx,
 		uint32_t session_id, tpSirBssDescription bss_desc,
 		enum csr_roam_reason reason, bool immediate)
 {
@@ -137,7 +137,7 @@ QDF_STATUS csr_roam_enqueue_preauth(tpAniSirGlobal mac_ctx,
  *
  * Return: None
  */
-void csr_neighbor_roam_purge_preauth_failed_list(tpAniSirGlobal mac_ctx)
+void csr_neighbor_roam_purge_preauth_failed_list(struct mac_context *mac_ctx)
 {
 	uint8_t i;
 	uint8_t j;
@@ -163,7 +163,7 @@ void csr_neighbor_roam_purge_preauth_failed_list(tpAniSirGlobal mac_ctx)
  *
  * Return: None
  */
-void csr_neighbor_roam_reset_preauth_control_info(tpAniSirGlobal mac_ctx,
+void csr_neighbor_roam_reset_preauth_control_info(struct mac_context *mac_ctx,
 		uint8_t session_id)
 {
 	tpCsrNeighborRoamControlInfo neigh_roam_info =
@@ -202,7 +202,7 @@ void csr_neighbor_roam_reset_preauth_control_info(tpAniSirGlobal mac_ctx,
  * Return: QDF_STATUS_SUCCESS on success (i.e. pre-auth processed),
  *         QDF_STATUS_E_FAILURE otherwise
  */
-QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(struct mac_context *mac_ctx,
 						 uint8_t session_id,
 						 QDF_STATUS lim_status)
 {
@@ -368,7 +368,7 @@ DEQ_PREAUTH:
  *
  * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise
  */
-static QDF_STATUS csr_neighbor_roam_add_preauth_fail(tpAniSirGlobal mac_ctx,
+static QDF_STATUS csr_neighbor_roam_add_preauth_fail(struct mac_context *mac_ctx,
 			uint8_t session_id, tSirMacAddr bssid)
 {
 	uint8_t i = 0;
@@ -414,7 +414,7 @@ static QDF_STATUS csr_neighbor_roam_add_preauth_fail(tpAniSirGlobal mac_ctx,
  *
  * Return: true if preauth candidate, false otherwise
  */
-bool csr_neighbor_roam_is_preauth_candidate(tpAniSirGlobal mac,
+bool csr_neighbor_roam_is_preauth_candidate(struct mac_context *mac,
 		    uint8_t sessionId, tSirMacAddr bssId)
 {
 	uint8_t i = 0;
@@ -449,7 +449,7 @@ bool csr_neighbor_roam_is_preauth_candidate(tpAniSirGlobal mac,
  *
  * Return: dot11mode
  */
-static uint32_t csr_get_dot11_mode(tpAniSirGlobal mac_ctx,
+static uint32_t csr_get_dot11_mode(struct mac_context *mac_ctx,
 				   uint32_t session_id,
 				   tpSirBssDescription bss_desc)
 {
@@ -508,7 +508,7 @@ static uint32_t csr_get_dot11_mode(tpAniSirGlobal mac_ctx,
 	return dot11mode;
 }
 
-QDF_STATUS csr_roam_issue_ft_preauth_req(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_roam_issue_ft_preauth_req(struct mac_context *mac_ctx,
 					 uint32_t session_id,
 					 tpSirBssDescription bss_desc)
 {
@@ -580,7 +580,7 @@ QDF_STATUS csr_roam_issue_ft_preauth_req(tpAniSirGlobal mac_ctx,
 	return status;
 }
 
-void csr_roam_ft_pre_auth_rsp_processor(tpAniSirGlobal mac_ctx,
+void csr_roam_ft_pre_auth_rsp_processor(struct mac_context *mac_ctx,
 					tpSirFTPreAuthRsp preauth_rsp)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
@@ -721,7 +721,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tpAniSirGlobal mac_ctx,
  *
  * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise
  */
-QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac_ctx,
+QDF_STATUS csr_neighbor_roam_issue_preauth_req(struct mac_context *mac_ctx,
 						      uint8_t session_id)
 {
 	tpCsrNeighborRoamControlInfo neighbor_roam_info =