diff --git a/core/sme/inc/sme_ft_api.h b/core/sme/inc/sme_ft_api.h index 6e15bdcff2..e5674a2188 100644 --- a/core/sme/inc/sme_ft_api.h +++ b/core/sme/inc/sme_ft_api.h @@ -40,7 +40,7 @@ typedef enum eFTIEState { /* FT neighbor roam callback user context */ typedef struct sFTRoamCallbackUsrCtx { - tpAniSirGlobal mac; + struct mac_context *mac; uint8_t sessionId; } tFTRoamCallbackUsrCtx, *tpFTRoamCallbackUsrCtx; diff --git a/core/sme/inc/sme_inside.h b/core/sme/inc/sme_inside.h index 9a958a4a81..cc0d10eaf0 100644 --- a/core/sme/inc/sme_inside.h +++ b/core/sme/inc/sme_inside.h @@ -193,15 +193,15 @@ enum wlan_serialization_cmd_type csr_get_cmd_type(tSmeCmd *sme_cmd); * * Return: QDF_STATUS_SUCCESS or QDF_STATUS_E_FAILURE */ -QDF_STATUS csr_set_serialization_params_to_cmd(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_set_serialization_params_to_cmd(struct mac_context *mac_ctx, tSmeCmd *sme_cmd, struct wlan_serialization_command *cmd, uint8_t high_priority); -tSmeCmd *sme_get_command_buffer(tpAniSirGlobal mac); -void sme_release_command(tpAniSirGlobal mac, tSmeCmd *pCmd); -bool qos_process_command(tpAniSirGlobal mac, tSmeCmd *pCommand); -void qos_release_command(tpAniSirGlobal mac, tSmeCmd *pCommand); -QDF_STATUS csr_process_scan_command(tpAniSirGlobal mac, tSmeCmd *pCommand); -QDF_STATUS csr_roam_process_command(tpAniSirGlobal mac, tSmeCmd *pCommand); +tSmeCmd *sme_get_command_buffer(struct mac_context *mac); +void sme_release_command(struct mac_context *mac, tSmeCmd *pCmd); +bool qos_process_command(struct mac_context *mac, tSmeCmd *pCommand); +void qos_release_command(struct mac_context *mac, tSmeCmd *pCommand); +QDF_STATUS csr_process_scan_command(struct mac_context *mac, tSmeCmd *pCommand); +QDF_STATUS csr_roam_process_command(struct mac_context *mac, tSmeCmd *pCommand); /** * csr_roam_wm_status_change_complete() - Remove WM status change command @@ -214,9 +214,9 @@ QDF_STATUS csr_roam_process_command(tpAniSirGlobal mac, tSmeCmd *pCommand); * * Return: void */ -void csr_roam_wm_status_change_complete(tpAniSirGlobal mac_ctx, +void csr_roam_wm_status_change_complete(struct mac_context *mac_ctx, uint8_t session_id); -void csr_roam_process_wm_status_change_command(tpAniSirGlobal mac, +void csr_roam_process_wm_status_change_command(struct mac_context *mac, tSmeCmd *pCommand); /** * csr_process_del_sta_session_command() - Post WMA_DEL_STA_SELF_REQ to wma @@ -228,41 +228,41 @@ void csr_roam_process_wm_status_change_command(tpAniSirGlobal mac, * * Return: QDF_STATUS_SUCCESS or QDF_STATUS_E_FAILURE */ -QDF_STATUS csr_process_del_sta_session_command(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_process_del_sta_session_command(struct mac_context *mac_ctx, tSmeCmd *sme_command); -void csr_reinit_roam_cmd(tpAniSirGlobal mac, tSmeCmd *pCommand); -void csr_reinit_wm_status_change_cmd(tpAniSirGlobal mac, tSmeCmd *pCommand); -QDF_STATUS csr_roam_send_set_key_cmd(tpAniSirGlobal mac_ctx, +void csr_reinit_roam_cmd(struct mac_context *mac, tSmeCmd *pCommand); +void csr_reinit_wm_status_change_cmd(struct mac_context *mac, tSmeCmd *pCommand); +QDF_STATUS csr_roam_send_set_key_cmd(struct mac_context *mac_ctx, uint32_t session_id, struct setkey_cmd *set_key_cmd); -QDF_STATUS csr_is_valid_channel(tpAniSirGlobal mac, uint8_t chnNum); +QDF_STATUS csr_is_valid_channel(struct mac_context *mac, uint8_t chnNum); QDF_STATUS sme_acquire_global_lock(tSmeStruct *psSme); QDF_STATUS sme_release_global_lock(tSmeStruct *psSme); -QDF_STATUS csr_process_add_sta_session_rsp(tpAniSirGlobal mac, uint8_t *pMsg); -QDF_STATUS csr_process_del_sta_session_rsp(tpAniSirGlobal mac, uint8_t *pMsg); +QDF_STATUS csr_process_add_sta_session_rsp(struct mac_context *mac, uint8_t *pMsg); +QDF_STATUS csr_process_del_sta_session_rsp(struct mac_context *mac, uint8_t *pMsg); -bool csr_roamGetConcurrencyConnectStatusForBmps(tpAniSirGlobal mac); +bool csr_roamGetConcurrencyConnectStatusForBmps(struct mac_context *mac); -QDF_STATUS csr_flush_cfg_bg_scan_roam_channel_list(tpAniSirGlobal mac, +QDF_STATUS csr_flush_cfg_bg_scan_roam_channel_list(struct mac_context *mac, uint8_t sessionId); -QDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal mac, +QDF_STATUS csr_create_bg_scan_roam_channel_list(struct mac_context *mac, uint8_t sessionId, const uint8_t *pChannelList, const uint8_t numChannels); #ifdef FEATURE_WLAN_ESE -QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal mac, +QDF_STATUS csr_create_roam_scan_channel_list(struct mac_context *mac, uint8_t sessionId, uint8_t *pChannelList, uint8_t numChannels, const enum band_info eBand); #endif -QDF_STATUS p2p_process_remain_on_channel_cmd(tpAniSirGlobal mac, +QDF_STATUS p2p_process_remain_on_channel_cmd(struct mac_context *mac, tSmeCmd *p2pRemainonChn); ePhyChanBondState csr_convert_cb_ini_value_to_phy_cb_state(uint32_t cbIniValue); -void csr_process_set_dual_mac_config(tpAniSirGlobal mac, tSmeCmd *command); -void csr_process_set_antenna_mode(tpAniSirGlobal mac, tSmeCmd *command); -void csr_process_set_hw_mode(tpAniSirGlobal mac, tSmeCmd *command); -void csr_process_nss_update_req(tpAniSirGlobal mac, tSmeCmd *command); +void csr_process_set_dual_mac_config(struct mac_context *mac, tSmeCmd *command); +void csr_process_set_antenna_mode(struct mac_context *mac, tSmeCmd *command); +void csr_process_set_hw_mode(struct mac_context *mac, tSmeCmd *command); +void csr_process_nss_update_req(struct mac_context *mac, tSmeCmd *command); #endif /* #if !defined( __SMEINSIDE_H ) */ diff --git a/core/sme/inc/sme_nan_datapath.h b/core/sme/inc/sme_nan_datapath.h index 817055bc9f..80fed5a7b8 100644 --- a/core/sme/inc/sme_nan_datapath.h +++ b/core/sme/inc/sme_nan_datapath.h @@ -29,15 +29,15 @@ #ifdef WLAN_FEATURE_NAN_DATAPATH /* Start NDI BSS */ -QDF_STATUS csr_roam_start_ndi(tpAniSirGlobal mac_ctx, uint32_t session_id, +QDF_STATUS csr_roam_start_ndi(struct mac_context *mac_ctx, uint32_t session_id, struct csr_roam_profile *profile); -void csr_roam_save_ndi_connected_info(tpAniSirGlobal mac_ctx, +void csr_roam_save_ndi_connected_info(struct mac_context *mac_ctx, uint32_t session_id, struct csr_roam_profile *roam_profile, tSirBssDescription *bss_desc); -void csr_roam_update_ndp_return_params(tpAniSirGlobal mac_ctx, +void csr_roam_update_ndp_return_params(struct mac_context *mac_ctx, uint32_t result, uint32_t *roam_status, uint32_t *roam_result, @@ -45,21 +45,21 @@ void csr_roam_update_ndp_return_params(tpAniSirGlobal mac_ctx, #else /* Start NDI BSS */ -static inline QDF_STATUS csr_roam_start_ndi(tpAniSirGlobal mac_ctx, +static inline QDF_STATUS csr_roam_start_ndi(struct mac_context *mac_ctx, uint32_t session_id, struct csr_roam_profile *profile) { return QDF_STATUS_SUCCESS; } -static inline void csr_roam_save_ndi_connected_info(tpAniSirGlobal mac_ctx, +static inline void csr_roam_save_ndi_connected_info(struct mac_context *mac_ctx, uint32_t session_id, struct csr_roam_profile *roam_profile, tSirBssDescription *bss_desc) { } -static inline void csr_roam_update_ndp_return_params(tpAniSirGlobal mac_ctx, +static inline void csr_roam_update_ndp_return_params(struct mac_context *mac_ctx, uint32_t result, uint32_t *roam_status, uint32_t *roam_result, diff --git a/core/sme/inc/sme_power_save_api.h b/core/sme/inc/sme_power_save_api.h index 87ede7c352..a57e04bcb0 100644 --- a/core/sme/inc/sme_power_save_api.h +++ b/core/sme/inc/sme_power_save_api.h @@ -34,13 +34,13 @@ QDF_STATUS sme_ps_uapsd_enable(mac_handle_t mac_handle, uint32_t session_id); QDF_STATUS sme_ps_uapsd_disable(mac_handle_t mac_handle, uint32_t session_id); /* Condition check if driver is ready to enter in PS */ -QDF_STATUS sme_enable_sta_ps_check(tpAniSirGlobal mac_ctx, uint32_t session_id); +QDF_STATUS sme_enable_sta_ps_check(struct mac_context *mac_ctx, uint32_t session_id); -QDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_ps_process_command(struct mac_context *mac_ctx, uint32_t session_id, enum sme_ps_cmd command); -void sme_set_tspec_uapsd_mask_per_session(tpAniSirGlobal mac_ctx, +void sme_set_tspec_uapsd_mask_per_session(struct mac_context *mac_ctx, tSirMacTSInfo *ts_info, uint8_t session_id); /* Full Power Req Callback */ @@ -59,7 +59,7 @@ QDF_STATUS sme_set_ps_ns_offload(mac_handle_t mac_handle, #endif /* WLAN_NS_OFFLOAD */ /* / Post a message to PE module */ -QDF_STATUS sme_post_pe_message(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_post_pe_message(struct mac_context *mac_ctx, struct scheduler_msg *pMsg); /** diff --git a/core/sme/inc/sme_rrm_api.h b/core/sme/inc/sme_rrm_api.h index df30633688..915ba296e3 100644 --- a/core/sme/inc/sme_rrm_api.h +++ b/core/sme/inc/sme_rrm_api.h @@ -37,16 +37,16 @@ #include "sme_internal.h" #include "sme_rrm_internal.h" -QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal mac, uint16_t msg_type, +QDF_STATUS sme_rrm_msg_processor(struct mac_context *mac, uint16_t msg_type, void *pMsgBuf); -QDF_STATUS rrm_close(tpAniSirGlobal mac); -QDF_STATUS rrm_open(tpAniSirGlobal mac); -QDF_STATUS rrm_change_default_config_param(tpAniSirGlobal mac, +QDF_STATUS rrm_close(struct mac_context *mac); +QDF_STATUS rrm_open(struct mac_context *mac); +QDF_STATUS rrm_change_default_config_param(struct mac_context *mac, struct rrm_config_param *rrm_config); -QDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal mac, +QDF_STATUS sme_rrm_neighbor_report_request(struct mac_context *mac, uint8_t sessionId, tpRrmNeighborReq pNeighborReq, tpRrmNeighborRspCallbackInfo callbackInfo); -QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal mac, +QDF_STATUS sme_rrm_process_beacon_report_req_ind(struct mac_context *mac, void *pMsgBuf); /** @@ -56,7 +56,7 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal mac, * Return: QDF_STATUS * QDF_STATUS_SUCCESS success */ -QDF_STATUS rrm_start(tpAniSirGlobal mac_ctx); +QDF_STATUS rrm_start(struct mac_context *mac_ctx); /** * rrm_stop() - stop the RRM module @@ -65,6 +65,6 @@ QDF_STATUS rrm_start(tpAniSirGlobal mac_ctx); * Return: QDF_STATUS * QDF_STATUS_SUCCESS success */ -QDF_STATUS rrm_stop(tpAniSirGlobal mac_ctx); +QDF_STATUS rrm_stop(struct mac_context *mac_ctx); #endif diff --git a/core/sme/inc/sme_trace.h b/core/sme/inc/sme_trace.h index 7d3138ccf0..f84642bc35 100644 --- a/core/sme/inc/sme_trace.h +++ b/core/sme/inc/sme_trace.h @@ -141,5 +141,5 @@ enum { TRACE_CODE_SME_RX_WMA_MSG, }; -void sme_trace_init(tpAniSirGlobal mac); +void sme_trace_init(struct mac_context *mac); #endif /* __SME_TRACE_H__ */ diff --git a/core/sme/src/common/sme_ft_api.c b/core/sme/src/common/sme_ft_api.c index 40dca01693..9897db8119 100644 --- a/core/sme/src/common/sme_ft_api.c +++ b/core/sme/src/common/sme_ft_api.c @@ -25,7 +25,7 @@ /* Initialize the FT context. */ void sme_ft_open(mac_handle_t mac_handle, uint32_t sessionId) { - tpAniSirGlobal mac = MAC_CONTEXT(mac_handle); + struct mac_context *mac = MAC_CONTEXT(mac_handle); QDF_STATUS status = QDF_STATUS_SUCCESS; struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId); @@ -60,7 +60,7 @@ void sme_ft_open(mac_handle_t mac_handle, uint32_t sessionId) /* Cleanup the SME FT Global context. */ void sme_ft_close(mac_handle_t mac_handle, uint32_t sessionId) { - tpAniSirGlobal mac = MAC_CONTEXT(mac_handle); + struct mac_context *mac = MAC_CONTEXT(mac_handle); struct csr_roam_session *pSession = NULL; /* Clear the FT Context */ @@ -89,7 +89,7 @@ void sme_ft_close(mac_handle_t mac_handle, uint32_t sessionId) void sme_set_ft_pre_auth_state(mac_handle_t mac_handle, uint32_t sessionId, bool state) { - tpAniSirGlobal mac = MAC_CONTEXT(mac_handle); + struct mac_context *mac = MAC_CONTEXT(mac_handle); struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId); if (pSession) @@ -98,7 +98,7 @@ void sme_set_ft_pre_auth_state(mac_handle_t mac_handle, uint32_t sessionId, bool sme_get_ft_pre_auth_state(mac_handle_t mac_handle, uint32_t sessionId) { - tpAniSirGlobal mac = MAC_CONTEXT(mac_handle); + struct mac_context *mac = MAC_CONTEXT(mac_handle); struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId); if (pSession) @@ -122,7 +122,7 @@ bool sme_get_ft_pre_auth_state(mac_handle_t mac_handle, uint32_t sessionId) void sme_set_ft_ies(mac_handle_t mac_handle, uint32_t session_id, const uint8_t *ft_ies, uint16_t ft_ies_length) { - tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle); + struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle); struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id); QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -232,7 +232,7 @@ void sme_set_ft_ies(mac_handle_t mac_handle, uint32_t session_id, * Return: QDF_STATUS */ static -QDF_STATUS sme_ft_send_update_key_ind(tpAniSirGlobal mac, uint32_t session_id, +QDF_STATUS sme_ft_send_update_key_ind(struct mac_context *mac, uint32_t session_id, tCsrRoamSetKey *ftkey_info) { tSirFTUpdateKeyInfo *msg; @@ -284,7 +284,7 @@ QDF_STATUS sme_ft_send_update_key_ind(tpAniSirGlobal mac, uint32_t session_id, bool sme_get_ftptk_state(mac_handle_t mac_handle, uint32_t sessionId) { - tpAniSirGlobal mac = MAC_CONTEXT(mac_handle); + struct mac_context *mac = MAC_CONTEXT(mac_handle); struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId); if (!pSession) { @@ -297,7 +297,7 @@ bool sme_get_ftptk_state(mac_handle_t mac_handle, uint32_t sessionId) void sme_set_ftptk_state(mac_handle_t mac_handle, uint32_t sessionId, bool state) { - tpAniSirGlobal mac = MAC_CONTEXT(mac_handle); + struct mac_context *mac = MAC_CONTEXT(mac_handle); struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId); if (!pSession) { @@ -310,7 +310,7 @@ void sme_set_ftptk_state(mac_handle_t mac_handle, uint32_t sessionId, QDF_STATUS sme_ft_update_key(mac_handle_t mac_handle, uint32_t sessionId, tCsrRoamSetKey *pFTKeyInfo) { - tpAniSirGlobal mac = MAC_CONTEXT(mac_handle); + struct mac_context *mac = MAC_CONTEXT(mac_handle); struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId); QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -373,7 +373,7 @@ void sme_get_ft_pre_auth_response(mac_handle_t mac_handle, uint32_t sessionId, uint8_t *ft_ies, uint32_t ft_ies_ip_len, uint16_t *ft_ies_length) { - tpAniSirGlobal mac = MAC_CONTEXT(mac_handle); + struct mac_context *mac = MAC_CONTEXT(mac_handle); struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId); QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -423,7 +423,7 @@ void sme_get_rici_es(mac_handle_t mac_handle, uint32_t sessionId, uint8_t *ric_ies, uint32_t ric_ies_ip_len, uint32_t *ric_ies_length) { - tpAniSirGlobal mac = MAC_CONTEXT(mac_handle); + struct mac_context *mac = MAC_CONTEXT(mac_handle); struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId); QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -475,7 +475,7 @@ void sme_preauth_reassoc_intvl_timer_callback(void *context) /* Reset the FT context. */ void sme_ft_reset(mac_handle_t mac_handle, uint32_t sessionId) { - tpAniSirGlobal mac = MAC_CONTEXT(mac_handle); + struct mac_context *mac = MAC_CONTEXT(mac_handle); struct csr_roam_session *pSession = NULL; if (mac == NULL) { diff --git a/core/sme/src/common/sme_power_save.c b/core/sme/src/common/sme_power_save.c index 8915d8a693..36a7277e11 100644 --- a/core/sme/src/common/sme_power_save.c +++ b/core/sme/src/common/sme_power_save.c @@ -66,7 +66,7 @@ static QDF_STATUS sme_post_ps_msg_to_wma(uint16_t type, void *body) * * Return: QDF_STATUS */ -static void sme_ps_fill_uapsd_req_params(tpAniSirGlobal mac_ctx, +static void sme_ps_fill_uapsd_req_params(struct mac_context *mac_ctx, tUapsd_Params *uapsdParams, uint32_t session_id, enum ps_state *ps_state) { @@ -116,7 +116,7 @@ static void sme_ps_fill_uapsd_req_params(tpAniSirGlobal mac_ctx, } } -static void sme_set_ps_state(tpAniSirGlobal mac_ctx, +static void sme_set_ps_state(struct mac_context *mac_ctx, uint32_t session_id, enum ps_state ps_state) { struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; @@ -125,7 +125,7 @@ static void sme_set_ps_state(tpAniSirGlobal mac_ctx, ps_param->ps_state = ps_state; } -static void sme_get_ps_state(tpAniSirGlobal mac_ctx, +static void sme_get_ps_state(struct mac_context *mac_ctx, uint32_t session_id, enum ps_state *ps_state) { struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; @@ -139,7 +139,7 @@ static void sme_get_ps_state(tpAniSirGlobal mac_ctx, * * Return: QDF_STATUS */ -static QDF_STATUS sme_ps_enable_ps_req_params(tpAniSirGlobal mac_ctx, +static QDF_STATUS sme_ps_enable_ps_req_params(struct mac_context *mac_ctx, uint32_t session_id) { struct sEnablePsParams *enable_ps_req_params; @@ -181,7 +181,7 @@ static QDF_STATUS sme_ps_enable_ps_req_params(tpAniSirGlobal mac_ctx, * * Return: QDF_STATUS */ -static QDF_STATUS sme_ps_disable_ps_req_params(tpAniSirGlobal mac_ctx, +static QDF_STATUS sme_ps_disable_ps_req_params(struct mac_context *mac_ctx, uint32_t session_id) { struct sDisablePsParams *disable_ps_req_params; @@ -210,7 +210,7 @@ static QDF_STATUS sme_ps_disable_ps_req_params(tpAniSirGlobal mac_ctx, * * Return: QDF_STATUS */ -static QDF_STATUS sme_ps_enable_uapsd_req_params(tpAniSirGlobal mac_ctx, +static QDF_STATUS sme_ps_enable_uapsd_req_params(struct mac_context *mac_ctx, uint32_t session_id) { @@ -246,7 +246,7 @@ static QDF_STATUS sme_ps_enable_uapsd_req_params(tpAniSirGlobal mac_ctx, * * Return: QDF_STATUS */ -static QDF_STATUS sme_ps_disable_uapsd_req_params(tpAniSirGlobal mac_ctx, +static QDF_STATUS sme_ps_disable_uapsd_req_params(struct mac_context *mac_ctx, uint32_t session_id) { struct sDisableUapsdParams *disable_uapsd_req_params; @@ -284,7 +284,7 @@ static QDF_STATUS sme_ps_disable_uapsd_req_params(tpAniSirGlobal mac_ctx, * * Return: QDF_STATUS */ -QDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, uint32_t session_id, +QDF_STATUS sme_ps_process_command(struct mac_context *mac_ctx, uint32_t session_id, enum sme_ps_cmd command) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -332,7 +332,7 @@ QDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, uint32_t session_id, * * Return: QDF_STATUS */ -QDF_STATUS sme_enable_sta_ps_check(tpAniSirGlobal mac_ctx, uint32_t session_id) +QDF_STATUS sme_enable_sta_ps_check(struct mac_context *mac_ctx, uint32_t session_id) { struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; @@ -371,7 +371,7 @@ QDF_STATUS sme_ps_enable_disable(mac_handle_t mac_handle, uint32_t session_id, enum sme_ps_cmd command) { QDF_STATUS status = QDF_STATUS_E_FAILURE; - tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle); + struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle); status = sme_enable_sta_ps_check(mac_ctx, session_id); if (status != QDF_STATUS_SUCCESS) { @@ -393,7 +393,7 @@ QDF_STATUS sme_ps_enable_disable(mac_handle_t mac_handle, uint32_t session_id, QDF_STATUS sme_ps_timer_flush_sync(mac_handle_t mac_handle, uint8_t session_id) { QDF_STATUS status; - tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle); + struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle); struct ps_params *ps_parm; enum ps_state ps_state; QDF_TIMER_STATE tstate; @@ -460,7 +460,7 @@ QDF_STATUS sme_ps_uapsd_enable(mac_handle_t mac_handle, uint32_t session_id) { QDF_STATUS status = QDF_STATUS_E_FAILURE; - tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle); + struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle); status = sme_enable_sta_ps_check(mac_ctx, session_id); if (status != QDF_STATUS_SUCCESS) @@ -484,7 +484,7 @@ QDF_STATUS sme_ps_uapsd_disable(mac_handle_t mac_handle, uint32_t session_id) { QDF_STATUS status = QDF_STATUS_E_FAILURE; - tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle); + struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle); status = sme_enable_sta_ps_check(mac_ctx, session_id); if (status != QDF_STATUS_SUCCESS) @@ -505,7 +505,7 @@ QDF_STATUS sme_ps_uapsd_disable(mac_handle_t mac_handle, uint32_t session_id) * * Return: QDF_STATUS */ -void sme_set_tspec_uapsd_mask_per_session(tpAniSirGlobal mac_ctx, +void sme_set_tspec_uapsd_mask_per_session(struct mac_context *mac_ctx, tSirMacTSInfo *ts_info, uint8_t session_id) { @@ -611,7 +611,7 @@ QDF_STATUS sme_set_ps_host_offload(mac_handle_t mac_handle, { tpSirHostOffloadReq request_buf; struct scheduler_msg msg = {0}; - tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle); + struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle); struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id); QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, @@ -667,7 +667,7 @@ QDF_STATUS sme_set_ps_ns_offload(mac_handle_t mac_handle, tpSirHostOffloadReq request, uint8_t session_id) { - tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle); + struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle); tpSirHostOffloadReq request_buf; struct scheduler_msg msg = {0}; struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id); @@ -720,7 +720,7 @@ QDF_STATUS sme_set_ps_ns_offload(mac_handle_t mac_handle, * @return None */ -QDF_STATUS sme_post_pe_message(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_post_pe_message(struct mac_context *mac_ctx, struct scheduler_msg *msg) { QDF_STATUS qdf_status; @@ -741,7 +741,7 @@ QDF_STATUS sme_post_pe_message(tpAniSirGlobal mac_ctx, QDF_STATUS sme_ps_enable_auto_ps_timer(mac_handle_t mac_handle, uint32_t session_id, uint32_t timeout) { - tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle); + struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle); struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; struct ps_params *ps_param = &ps_global_info->ps_params[session_id]; QDF_STATUS qdf_status; @@ -770,7 +770,7 @@ QDF_STATUS sme_ps_enable_auto_ps_timer(mac_handle_t mac_handle, QDF_STATUS sme_ps_disable_auto_ps_timer(mac_handle_t mac_handle, uint32_t session_id) { - tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle); + struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle); struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; struct ps_params *ps_param = &ps_global_info->ps_params[session_id]; /* @@ -805,7 +805,7 @@ QDF_STATUS sme_ps_open(mac_handle_t mac_handle) QDF_STATUS sme_ps_open_per_session(mac_handle_t mac_handle, uint32_t session_id) { - tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle); + struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle); struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; struct ps_params *ps_param = &ps_global_info->ps_params[session_id]; @@ -827,7 +827,7 @@ QDF_STATUS sme_ps_open_per_session(mac_handle_t mac_handle, uint32_t session_id) void sme_auto_ps_entry_timer_expired(void *data) { struct ps_params *ps_params = (struct ps_params *)data; - tpAniSirGlobal mac_ctx; + struct mac_context *mac_ctx; uint32_t session_id; QDF_STATUS status; @@ -835,7 +835,7 @@ void sme_auto_ps_entry_timer_expired(void *data) sme_err("ps_params is NULL"); return; } - mac_ctx = (tpAniSirGlobal)ps_params->mac_ctx; + mac_ctx = (struct mac_context *)ps_params->mac_ctx; if (!mac_ctx) { sme_err("mac_ctx is NULL"); return; @@ -863,7 +863,7 @@ QDF_STATUS sme_ps_close_per_session(mac_handle_t mac_handle, uint32_t session_id) { - tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle); + struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle); struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; struct ps_params *ps_param = &ps_global_info->ps_params[session_id]; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; @@ -886,7 +886,7 @@ QDF_STATUS sme_ps_close_per_session(mac_handle_t mac_handle, bool sme_is_auto_ps_timer_running(mac_handle_t mac_handle, uint32_t session_id) { - tpAniSirGlobal mac_ctx = MAC_CONTEXT(mac_handle); + struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle); struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; struct ps_params *ps_param = &ps_global_info->ps_params[session_id]; bool status = false; diff --git a/core/sme/src/common/sme_trace.c b/core/sme/src/common/sme_trace.c index f69ab786d1..dba9d79f27 100644 --- a/core/sme/src/common/sme_trace.c +++ b/core/sme/src/common/sme_trace.c @@ -22,12 +22,12 @@ * * Author Kiran Kumar Reddy CH L V */ -#include "ani_global.h" /* for tpAniSirGlobal */ +#include "ani_global.h" /* for struct mac_context **/ #include "mac_trace.h" #include "sme_trace.h" #include "sme_internal.h" #ifndef SME_TRACE_RECORD -void sme_trace_init(tpAniSirGlobal mac) +void sme_trace_init(struct mac_context *mac) { } @@ -209,7 +209,7 @@ static void sme_trace_dump(void *mac_ctx, tp_qdf_trace_record record, } } -void sme_trace_init(tpAniSirGlobal mac) +void sme_trace_init(struct mac_context *mac) { qdf_trace_register(QDF_MODULE_ID_SME, &sme_trace_dump); } diff --git a/core/sme/src/nan/nan_api.c b/core/sme/src/nan/nan_api.c index 2b9e815199..4d43886794 100644 --- a/core/sme/src/nan/nan_api.c +++ b/core/sme/src/nan/nan_api.c @@ -27,7 +27,7 @@ void sme_nan_register_callback(mac_handle_t mac_handle, nan_callback callback) { - tpAniSirGlobal mac = MAC_CONTEXT(mac_handle); + struct mac_context *mac = MAC_CONTEXT(mac_handle); if (!mac) { sme_err("Invalid MAC handle"); @@ -38,7 +38,7 @@ void sme_nan_register_callback(mac_handle_t mac_handle, nan_callback callback) void sme_nan_deregister_callback(mac_handle_t mac_handle) { - tpAniSirGlobal mac = MAC_CONTEXT(mac_handle); + struct mac_context *mac = MAC_CONTEXT(mac_handle); if (!mac) { sme_err("Invalid MAC handle"); @@ -82,7 +82,7 @@ QDF_STATUS sme_nan_request(tpNanRequestReq input) void sme_nan_event(mac_handle_t mac_handle, tSirNanEvent *event) { - tpAniSirGlobal mac = MAC_CONTEXT(mac_handle); + struct mac_context *mac = MAC_CONTEXT(mac_handle); sme_debug("Received eWNI_SME_NAN_EVENT"); diff --git a/core/sme/src/nan/nan_datapath_api.c b/core/sme/src/nan/nan_datapath_api.c index 9cf33a3956..931254989a 100644 --- a/core/sme/src/nan/nan_datapath_api.c +++ b/core/sme/src/nan/nan_datapath_api.c @@ -36,7 +36,7 @@ * * Return: Success or failure code */ -QDF_STATUS csr_roam_start_ndi(tpAniSirGlobal mac_ctx, uint32_t session, +QDF_STATUS csr_roam_start_ndi(struct mac_context *mac_ctx, uint32_t session, struct csr_roam_profile *profile) { QDF_STATUS status; @@ -75,7 +75,7 @@ QDF_STATUS csr_roam_start_ndi(tpAniSirGlobal mac_ctx, uint32_t session, * * Return: None */ -void csr_roam_save_ndi_connected_info(tpAniSirGlobal mac_ctx, +void csr_roam_save_ndi_connected_info(struct mac_context *mac_ctx, uint32_t session_id, struct csr_roam_profile *roam_profile, tSirBssDescription *bssdesc) @@ -124,7 +124,7 @@ void csr_roam_save_ndi_connected_info(tpAniSirGlobal mac_ctx, * * Results: None */ -void csr_roam_update_ndp_return_params(tpAniSirGlobal mac_ctx, +void csr_roam_update_ndp_return_params(struct mac_context *mac_ctx, uint32_t result, uint32_t *roam_status, uint32_t *roam_result, diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c index 3c15050d31..9bf3ad2d6d 100644 --- a/core/sme/src/rrm/sme_rrm.c +++ b/core/sme/src/rrm/sme_rrm.c @@ -74,7 +74,7 @@ uint64_t rrm_scan_timer; * * Return: void */ -static void rrm_ll_purge_neighbor_cache(tpAniSirGlobal mac, +static void rrm_ll_purge_neighbor_cache(struct mac_context *mac, tDblLinkList *pList) { tListElem *pEntry; @@ -103,7 +103,7 @@ static void rrm_ll_purge_neighbor_cache(tpAniSirGlobal mac, * * Return: void */ -static void rrm_indicate_neighbor_report_result(tpAniSirGlobal mac, +static void rrm_indicate_neighbor_report_result(struct mac_context *mac, QDF_STATUS qdf_status) { NeighborReportRspCallback callback; @@ -160,7 +160,7 @@ static void rrm_indicate_neighbor_report_result(tpAniSirGlobal mac, */ static QDF_STATUS -sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx, +sme_rrm_send_beacon_report_xmit_ind(struct mac_context *mac_ctx, tCsrScanResultInfo **result_arr, uint8_t msrmnt_status, uint8_t bss_count) { @@ -265,7 +265,7 @@ sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx, * Return: status */ static QDF_STATUS sme_ese_send_beacon_req_scan_results( - tpAniSirGlobal mac_ctx, uint32_t session_id, + struct mac_context *mac_ctx, uint32_t session_id, uint8_t channel, tCsrScanResultInfo **result_arr, uint8_t msrmnt_status, uint8_t bss_count) { @@ -406,7 +406,7 @@ static QDF_STATUS sme_ese_send_beacon_req_scan_results( * * Return: QDF_STATUS */ -static QDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, +static QDF_STATUS sme_rrm_send_scan_result(struct mac_context *mac_ctx, uint8_t num_chan, uint8_t *chan_list, uint8_t measurementdone) @@ -632,7 +632,7 @@ static QDF_STATUS sme_rrm_scan_request_callback(mac_handle_t mac_handle, eCsrScanStatus status) { uint16_t interval; - tpAniSirGlobal mac = MAC_CONTEXT(mac_handle); + struct mac_context *mac = MAC_CONTEXT(mac_handle); tpRrmSMEContext pSmeRrmContext = &mac->rrm.rrmSmeContext; uint32_t time_tick; @@ -717,7 +717,7 @@ static void sme_rrm_scan_event_callback(struct wlan_objmgr_vdev *vdev, * * Return: QDF_STATUS */ -static QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) +static QDF_STATUS sme_rrm_issue_scan_req(struct mac_context *mac_ctx) { QDF_STATUS status = QDF_STATUS_SUCCESS; tpRrmSMEContext sme_rrm_ctx = &mac_ctx->rrm.rrmSmeContext; @@ -920,7 +920,7 @@ free_ch_lst: * * Return : QDF_STATUS_SUCCESS - Validation is successful. */ -QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal mac, +QDF_STATUS sme_rrm_process_beacon_report_req_ind(struct mac_context *mac, void *pMsgBuf) { tpSirBeaconReportReqInd pBeaconReq = (tpSirBeaconReportReqInd) pMsgBuf; @@ -1035,7 +1035,7 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal mac, * * Return: QDF_STATUS_SUCCESS - Validation is successful. */ -QDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal mac, uint8_t +QDF_STATUS sme_rrm_neighbor_report_request(struct mac_context *mac, uint8_t sessionId, tpRrmNeighborReq pNeighborReq, tpRrmNeighborRspCallbackInfo @@ -1109,7 +1109,7 @@ QDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal mac, uint8_t * Return: void */ static void -rrm_calculate_neighbor_ap_roam_score(tpAniSirGlobal mac_ctx, +rrm_calculate_neighbor_ap_roam_score(struct mac_context *mac_ctx, tpRrmNeighborReportDesc nbr_report_desc) { tpSirNeighborBssDescripton nbr_bss_desc; @@ -1192,7 +1192,7 @@ check_11r_assoc: * * Return: void. */ -static void rrm_store_neighbor_rpt_by_roam_score(tpAniSirGlobal mac, +static void rrm_store_neighbor_rpt_by_roam_score(struct mac_context *mac, tpRrmNeighborReportDesc pNeighborReportDesc) { tpRrmSMEContext pSmeRrmContext = &mac->rrm.rrmSmeContext; @@ -1261,7 +1261,7 @@ static void rrm_store_neighbor_rpt_by_roam_score(tpAniSirGlobal mac, * * Return: QDF_STATUS_SUCCESS - Validation is successful */ -static QDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal mac, +static QDF_STATUS sme_rrm_process_neighbor_report(struct mac_context *mac, void *pMsgBuf) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -1350,7 +1350,7 @@ end: * * Return: QDF_STATUS_SUCCESS - Validation is successful. */ -QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal mac, uint16_t msg_type, +QDF_STATUS sme_rrm_msg_processor(struct mac_context *mac, uint16_t msg_type, void *pMsgBuf) { sme_debug("Msg = %d for RRM measurement", msg_type); @@ -1385,7 +1385,7 @@ QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal mac, uint16_t msg_type, */ static void rrm_iter_meas_timer_handle(void *userData) { - tpAniSirGlobal mac = (tpAniSirGlobal) userData; + struct mac_context *mac = (struct mac_context *) userData; sme_warn("Randomization timer expired...send on next channel"); /* Issue a scan req for next channel. */ @@ -1402,7 +1402,7 @@ static void rrm_iter_meas_timer_handle(void *userData) */ static void rrm_neighbor_rsp_timeout_handler(void *userData) { - tpAniSirGlobal mac = (tpAniSirGlobal) userData; + struct mac_context *mac = (struct mac_context *) userData; sme_warn("Neighbor Response timed out"); rrm_indicate_neighbor_report_result(mac, QDF_STATUS_E_FAILURE); @@ -1416,7 +1416,7 @@ static void rrm_neighbor_rsp_timeout_handler(void *userData) * * Return: QDF_STATUS */ -QDF_STATUS rrm_open(tpAniSirGlobal mac) +QDF_STATUS rrm_open(struct mac_context *mac) { QDF_STATUS qdf_status; @@ -1468,7 +1468,7 @@ QDF_STATUS rrm_open(tpAniSirGlobal mac) * QDF_STATUS_SUCCESS failure */ -QDF_STATUS rrm_close(tpAniSirGlobal mac) +QDF_STATUS rrm_close(struct mac_context *mac) { QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; @@ -1529,7 +1529,7 @@ QDF_STATUS rrm_close(tpAniSirGlobal mac) * Return: QDF_STATUS * QDF_STATUS_SUCCESS success */ -QDF_STATUS rrm_change_default_config_param(tpAniSirGlobal mac, +QDF_STATUS rrm_change_default_config_param(struct mac_context *mac, struct rrm_config_param *rrm_config) { qdf_mem_copy(&mac->rrm.rrmSmeContext.rrmConfig, rrm_config, @@ -1538,7 +1538,7 @@ QDF_STATUS rrm_change_default_config_param(tpAniSirGlobal mac, return QDF_STATUS_SUCCESS; } -QDF_STATUS rrm_start(tpAniSirGlobal mac_ctx) +QDF_STATUS rrm_start(struct mac_context *mac_ctx) { tpRrmSMEContext smerrmctx = &mac_ctx->rrm.rrmSmeContext; @@ -1551,7 +1551,7 @@ QDF_STATUS rrm_start(tpAniSirGlobal mac_ctx) return QDF_STATUS_SUCCESS; } -QDF_STATUS rrm_stop(tpAniSirGlobal mac_ctx) +QDF_STATUS rrm_stop(struct mac_context *mac_ctx) { tpRrmSMEContext smerrmctx = &mac_ctx->rrm.rrmSmeContext;