From edece84530f64e61945b4ad63fb99256c723a1dc Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 2 Dec 2018 11:13:52 -0800 Subject: [PATCH] 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 | 14 +- core/sme/inc/csr_internal.h | 172 +++--- core/sme/inc/csr_neighbor_roam.h | 122 ++--- core/sme/inc/csr_support.h | 40 +- core/sme/src/csr/csr_api_roam.c | 744 +++++++++++++------------- core/sme/src/csr/csr_api_scan.c | 140 ++--- core/sme/src/csr/csr_cmd_process.c | 2 +- core/sme/src/csr/csr_host_scan_roam.c | 26 +- core/sme/src/csr/csr_inside_api.h | 316 +++++------ core/sme/src/csr/csr_neighbor_roam.c | 54 +- core/sme/src/csr/csr_roam_preauth.c | 26 +- core/sme/src/csr/csr_util.c | 270 +++++----- 12 files changed, 963 insertions(+), 963 deletions(-) diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index a40b9233127f..12c2eb4573c2 100644 --- a/core/sme/inc/csr_api.h +++ b/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 diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index 1c2a9da1fc26..c1c24c92e106 100644 --- a/core/sme/inc/csr_internal.h +++ b/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 diff --git a/core/sme/inc/csr_neighbor_roam.h b/core/sme/inc/csr_neighbor_roam.h index 51b2c74a995c..3f2198d813d3 100644 --- a/core/sme/inc/csr_neighbor_roam.h +++ b/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); /** diff --git a/core/sme/inc/csr_support.h b/core/sme/inc/csr_support.h index b08597fe9ecb..7daee31834d3 100644 --- a/core/sme/inc/csr_support.h +++ b/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); diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 0c14f40d9509..cb7e59048656 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -21,7 +21,7 @@ * * Implementation for the Common Roaming interfaces. */ -#include "ani_global.h" /* for tpAniSirGlobal */ +#include "ani_global.h" /* for struct mac_context **/ #include "wma_types.h" #include "wma_if.h" /* for STA_INVALID_IDX. */ #include "csr_inside_api.h" @@ -162,7 +162,7 @@ csr_get_ielen_from_bss_description(tpSirBssDescription pBssDescr) * * Return: QDF_STATUS */ -static QDF_STATUS csr_sae_callback(tpAniSirGlobal mac_ctx, +static QDF_STATUS csr_sae_callback(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) { struct csr_roam_info *roam_info; @@ -197,7 +197,7 @@ static QDF_STATUS csr_sae_callback(tpAniSirGlobal mac_ctx, return QDF_STATUS_SUCCESS; } #else -static inline QDF_STATUS csr_sae_callback(tpAniSirGlobal mac_ctx, +static inline QDF_STATUS csr_sae_callback(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) { return QDF_STATUS_SUCCESS; @@ -384,50 +384,50 @@ csr_start_ibss_channels24[CSR_NUM_IBSS_START_CHANNELS_24] = { 1, 6, 11 }; static const uint8_t social_channel[MAX_SOCIAL_CHANNELS] = { 1, 6, 11 }; -static void init_config_param(tpAniSirGlobal mac); -static bool csr_roam_process_results(tpAniSirGlobal mac, tSmeCmd *pCommand, +static void init_config_param(struct mac_context *mac); +static bool csr_roam_process_results(struct mac_context *mac, tSmeCmd *pCommand, enum csr_roamcomplete_result Result, void *Context); -static QDF_STATUS csr_roam_start_ibss(tpAniSirGlobal mac, uint32_t sessionId, +static QDF_STATUS csr_roam_start_ibss(struct mac_context *mac, uint32_t sessionId, struct csr_roam_profile *pProfile, bool *pfSameIbss); -static void csr_roam_update_connected_profile_from_new_bss(tpAniSirGlobal mac, +static void csr_roam_update_connected_profile_from_new_bss(struct mac_context *mac, uint32_t sessionId, tSirSmeNewBssInfo * pNewBss); -static ePhyChanBondState csr_get_cb_mode_from_ies(tpAniSirGlobal mac, +static ePhyChanBondState csr_get_cb_mode_from_ies(struct mac_context *mac, uint8_t primaryChn, tDot11fBeaconIEs *pIes); -static void csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac, +static void csr_roaming_state_config_cnf_processor(struct mac_context *mac, tSmeCmd *pCommand, uint8_t session_id); -static QDF_STATUS csr_roam_open(tpAniSirGlobal mac); -static QDF_STATUS csr_roam_close(tpAniSirGlobal mac); -static bool csr_roam_is_same_profile_keys(tpAniSirGlobal mac, +static QDF_STATUS csr_roam_open(struct mac_context *mac); +static QDF_STATUS csr_roam_close(struct mac_context *mac); +static bool csr_roam_is_same_profile_keys(struct mac_context *mac, tCsrRoamConnectedProfile *pConnProfile, struct csr_roam_profile *pProfile2); -static QDF_STATUS csr_roam_start_roaming_timer(tpAniSirGlobal mac, +static QDF_STATUS csr_roam_start_roaming_timer(struct mac_context *mac, uint32_t sessionId, uint32_t interval); -static QDF_STATUS csr_roam_stop_roaming_timer(tpAniSirGlobal mac, +static QDF_STATUS csr_roam_stop_roaming_timer(struct mac_context *mac, uint32_t sessionId); static void csr_roam_roaming_timer_handler(void *pv); #ifdef WLAN_FEATURE_ROAM_OFFLOAD -static void csr_roam_roaming_offload_timer_action(tpAniSirGlobal mac_ctx, +static void csr_roam_roaming_offload_timer_action(struct mac_context *mac_ctx, uint32_t interval, uint8_t session_id, uint8_t action); #endif static void csr_roam_roaming_offload_timeout_handler(void *timer_data); -static QDF_STATUS csr_roam_start_wait_for_key_timer(tpAniSirGlobal mac, +static QDF_STATUS csr_roam_start_wait_for_key_timer(struct mac_context *mac, uint32_t interval); static void csr_roam_wait_for_key_time_out_handler(void *pv); -static QDF_STATUS csr_init11d_info(tpAniSirGlobal mac, tCsr11dinfo *ps11dinfo); -static QDF_STATUS csr_init_channel_power_list(tpAniSirGlobal mac, +static QDF_STATUS csr_init11d_info(struct mac_context *mac, tCsr11dinfo *ps11dinfo); +static QDF_STATUS csr_init_channel_power_list(struct mac_context *mac, tCsr11dinfo *ps11dinfo); -static QDF_STATUS csr_roam_free_connected_info(tpAniSirGlobal mac, +static QDF_STATUS csr_roam_free_connected_info(struct mac_context *mac, struct csr_roam_connectedinfo * pConnectedInfo); -static QDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal mac, +static QDF_STATUS csr_send_mb_set_context_req_msg(struct mac_context *mac, uint32_t sessionId, struct qdf_mac_addr peer_macaddr, uint8_t numKeys, @@ -436,68 +436,68 @@ static QDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal mac, uint8_t keyId, uint8_t keyLength, uint8_t *pKey, uint8_t paeRole, uint8_t *pKeyRsc); -static void csr_roam_link_up(tpAniSirGlobal mac, struct qdf_mac_addr bssid); -static void csr_roam_link_down(tpAniSirGlobal mac, uint32_t sessionId); +static void csr_roam_link_up(struct mac_context *mac, struct qdf_mac_addr bssid); +static void csr_roam_link_down(struct mac_context *mac, uint32_t sessionId); #ifndef QCA_SUPPORT_CP_STATS -static QDF_STATUS csr_send_mb_stats_req_msg(tpAniSirGlobal mac, +static QDF_STATUS csr_send_mb_stats_req_msg(struct mac_context *mac, uint32_t statsMask, uint8_t staId, uint8_t sessionId); /* pStaEntry is no longer invalid upon the return of this function. */ -static void csr_roam_remove_stat_list_entry(tpAniSirGlobal mac, +static void csr_roam_remove_stat_list_entry(struct mac_context *mac, tListElem *pEntry); struct csr_statsclient_reqinfo *csr_roam_insert_entry_into_list( - tpAniSirGlobal mac, tDblLinkList *pStaList, + struct mac_context *mac, tDblLinkList *pStaList, struct csr_statsclient_reqinfo * pStaEntry); -static void csr_roam_report_statistics(tpAniSirGlobal mac, +static void csr_roam_report_statistics(struct mac_context *mac, uint32_t statsMask, tCsrStatsCallback callback, uint8_t staId, void *pContext); tListElem *csr_roam_check_client_req_list( - tpAniSirGlobal mac, uint32_t statsMask); + struct mac_context *mac, uint32_t statsMask); static void csr_roam_remove_entry_from_pe_stats_req_list( - tpAniSirGlobal mac, struct csr_pestats_reqinfo *pPeStaEntry); + struct mac_context *mac, struct csr_pestats_reqinfo *pPeStaEntry); tListElem *csr_roam_find_in_pe_stats_req_list( - tpAniSirGlobal mac, + struct mac_context *mac, uint32_t statsMask); -static QDF_STATUS csr_roam_dereg_statistics_req(tpAniSirGlobal mac); +static QDF_STATUS csr_roam_dereg_statistics_req(struct mac_context *mac); #else -static QDF_STATUS csr_roam_dereg_statistics_req(tpAniSirGlobal mac) +static QDF_STATUS csr_roam_dereg_statistics_req(struct mac_context *mac) { return QDF_STATUS_SUCCESS; } #endif static enum csr_cfgdot11mode -csr_roam_get_phy_mode_band_for_bss(tpAniSirGlobal mac, +csr_roam_get_phy_mode_band_for_bss(struct mac_context *mac, struct csr_roam_profile *pProfile, uint8_t operationChn, enum band_info *pBand); static QDF_STATUS csr_roam_get_qos_info_from_bss( -tpAniSirGlobal mac, tSirBssDescription *pBssDesc); -static uint32_t csr_find_ibss_session(tpAniSirGlobal mac); -static uint32_t csr_find_session_by_type(tpAniSirGlobal, +struct mac_context *mac, tSirBssDescription *pBssDesc); +static uint32_t csr_find_ibss_session(struct mac_context *mac); +static uint32_t csr_find_session_by_type(struct mac_context *, enum QDF_OPMODE); -static bool csr_is_conn_allow_2g_band(tpAniSirGlobal mac, +static bool csr_is_conn_allow_2g_band(struct mac_context *mac, uint32_t chnl); -static bool csr_is_conn_allow_5g_band(tpAniSirGlobal mac, +static bool csr_is_conn_allow_5g_band(struct mac_context *mac, uint32_t chnl); -static QDF_STATUS csr_roam_start_wds(tpAniSirGlobal mac, +static QDF_STATUS csr_roam_start_wds(struct mac_context *mac, uint32_t sessionId, struct csr_roam_profile *pProfile, tSirBssDescription *pBssDesc); -static void csr_init_session(tpAniSirGlobal mac, uint32_t sessionId); -static QDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal mac, +static void csr_init_session(struct mac_context *mac, uint32_t sessionId); +static QDF_STATUS csr_roam_issue_set_key_command(struct mac_context *mac, uint32_t sessionId, tCsrRoamSetKey *pSetKey, uint32_t roamId); -static QDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal mac, +static QDF_STATUS csr_roam_get_qos_info_from_bss(struct mac_context *mac, tSirBssDescription *pBssDesc); static void csr_ser_des_unpack_diassoc_rsp(uint8_t *pBuf, tSirSmeDisassocRsp *pRsp); static void csr_init_operating_classes(struct mac_context *mac); -static void csr_add_len_of_social_channels(tpAniSirGlobal mac, +static void csr_add_len_of_social_channels(struct mac_context *mac, uint8_t *num_chan); -static void csr_add_social_channels(tpAniSirGlobal mac, +static void csr_add_social_channels(struct mac_context *mac, tSirUpdateChanList *chan_list, struct csr_scanstruct *pScan, uint8_t *num_chan); @@ -505,7 +505,7 @@ static void csr_add_social_channels(tpAniSirGlobal mac, static struct csr_roam_session *csr_roam_roam_session; /* Allocate and initialize global variables */ -static QDF_STATUS csr_roam_init_globals(tpAniSirGlobal mac) +static QDF_STATUS csr_roam_init_globals(struct mac_context *mac) { uint32_t buf_size; QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -535,7 +535,7 @@ static inline void csr_roam_free_globals(void) static struct csr_roam_session csr_roam_roam_session[CSR_ROAM_SESSION_MAX]; /* Initialize global variables */ -static QDF_STATUS csr_roam_init_globals(tpAniSirGlobal mac) +static QDF_STATUS csr_roam_init_globals(struct mac_context *mac) { qdf_mem_zero(&csr_roam_roam_session, sizeof(csr_roam_roam_session)); @@ -549,7 +549,7 @@ static inline void csr_roam_free_globals(void) } #endif /* WLAN_ALLOCATE_GLOBAL_BUFFERS_DYNAMICALLY */ -static void csr_roam_de_init_globals(tpAniSirGlobal mac) +static void csr_roam_de_init_globals(struct mac_context *mac) { uint8_t i; @@ -592,7 +592,7 @@ static void csr_close_stats_ll(struct mac_context *mac_ctx) } #endif -QDF_STATUS csr_open(tpAniSirGlobal mac) +QDF_STATUS csr_open(struct mac_context *mac) { QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t i; @@ -630,7 +630,7 @@ QDF_STATUS csr_open(tpAniSirGlobal mac) return status; } -QDF_STATUS csr_init_chan_list(tpAniSirGlobal mac, uint8_t *alpha2) +QDF_STATUS csr_init_chan_list(struct mac_context *mac, uint8_t *alpha2) { QDF_STATUS status; @@ -652,7 +652,7 @@ QDF_STATUS csr_init_chan_list(tpAniSirGlobal mac, uint8_t *alpha2) return status; } -QDF_STATUS csr_set_channels(tpAniSirGlobal mac, tCsrConfigParam *pParam) +QDF_STATUS csr_set_channels(struct mac_context *mac, tCsrConfigParam *pParam) { QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t index = 0; @@ -702,7 +702,7 @@ static void csr_assoc_rej_free_rssi_disallow_list(qdf_list_t *list) qdf_list_destroy(list); } -QDF_STATUS csr_close(tpAniSirGlobal mac) +QDF_STATUS csr_close(struct mac_context *mac) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -747,7 +747,7 @@ static int8_t csr_find_channel_pwr(struct channel_power * * * Return: None */ -static void csr_roam_arrange_ch_list(tpAniSirGlobal mac_ctx, +static void csr_roam_arrange_ch_list(struct mac_context *mac_ctx, tSirUpdateChanParam *chan_list, uint8_t num_channel) { bool prefer_5g = CSR_IS_ROAM_PREFER_5GHZ(mac_ctx); @@ -825,7 +825,7 @@ static void csr_roam_arrange_ch_list(tpAniSirGlobal mac_ctx, * * Return: None */ -static void csr_roam_sort_channel_for_early_stop(tpAniSirGlobal mac_ctx, +static void csr_roam_sort_channel_for_early_stop(struct mac_context *mac_ctx, tSirUpdateChanList *chan_list, uint8_t num_channel) { tSirUpdateChanList *chan_list_greedy, *chan_list_non_greedy; @@ -961,7 +961,7 @@ static QDF_STATUS csr_emu_chan_req(uint32_t channel_num) #endif #ifdef WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY -static void csr_add_len_of_social_channels(tpAniSirGlobal mac, +static void csr_add_len_of_social_channels(struct mac_context *mac, uint8_t *num_chan) { uint8_t i; @@ -981,7 +981,7 @@ static void csr_add_len_of_social_channels(tpAniSirGlobal mac, sme_debug("after adding - num_chan:%hu", *num_chan); } -static void csr_add_social_channels(tpAniSirGlobal mac, +static void csr_add_social_channels(struct mac_context *mac, tSirUpdateChanList *chan_list, struct csr_scanstruct *pScan, uint8_t *num_chan) { @@ -1013,12 +1013,12 @@ static void csr_add_social_channels(tpAniSirGlobal mac, *num_chan = no_chan; } #else -static void csr_add_len_of_social_channels(tpAniSirGlobal mac, +static void csr_add_len_of_social_channels(struct mac_context *mac, uint8_t *num_chan) { sme_debug("skip adding len of social channels"); } -static void csr_add_social_channels(tpAniSirGlobal mac, +static void csr_add_social_channels(struct mac_context *mac, tSirUpdateChanList *chan_list, struct csr_scanstruct *pScan, uint8_t *num_chan) { @@ -1026,7 +1026,7 @@ static void csr_add_social_channels(tpAniSirGlobal mac, } #endif -QDF_STATUS csr_update_channel_list(tpAniSirGlobal mac) +QDF_STATUS csr_update_channel_list(struct mac_context *mac) { tSirUpdateChanList *pChanList; struct csr_scanstruct *pScan = &mac->scan; @@ -1218,7 +1218,7 @@ static void csr_init_tl_stats(struct mac_context *mac_ctx) } #endif /* QCA_SUPPORT_CP_STATS */ -QDF_STATUS csr_start(tpAniSirGlobal mac) +QDF_STATUS csr_start(struct mac_context *mac) { QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t i; @@ -1248,7 +1248,7 @@ QDF_STATUS csr_start(tpAniSirGlobal mac) return status; } -QDF_STATUS csr_stop(tpAniSirGlobal mac) +QDF_STATUS csr_stop(struct mac_context *mac) { uint32_t sessionId; @@ -1281,7 +1281,7 @@ QDF_STATUS csr_stop(tpAniSirGlobal mac) return QDF_STATUS_SUCCESS; } -QDF_STATUS csr_ready(tpAniSirGlobal mac) +QDF_STATUS csr_ready(struct mac_context *mac) { QDF_STATUS status = QDF_STATUS_SUCCESS; /* If the gScanAgingTime is set to '0' then scan results aging timeout @@ -1295,7 +1295,7 @@ QDF_STATUS csr_ready(tpAniSirGlobal mac) return status; } -void csr_set_default_dot11_mode(tpAniSirGlobal mac) +void csr_set_default_dot11_mode(struct mac_context *mac) { uint32_t wniDot11mode = 0; @@ -1304,7 +1304,7 @@ void csr_set_default_dot11_mode(tpAniSirGlobal mac) cfg_set_int(mac, WNI_CFG_DOT11_MODE, wniDot11mode); } -void csr_set_global_cfgs(tpAniSirGlobal mac) +void csr_set_global_cfgs(struct mac_context *mac) { wlan_mlme_set_frag_threshold(mac->psoc, csr_get_frag_thresh(mac)); wlan_mlme_set_rts_threshold(mac->psoc, csr_get_rts_thresh(mac)); @@ -1374,7 +1374,7 @@ void csr_packetdump_timer_stop(void) sme_err("cannot stop packetdump timer"); } -static QDF_STATUS csr_roam_open(tpAniSirGlobal mac) +static QDF_STATUS csr_roam_open(struct mac_context *mac) { QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t i; @@ -1410,7 +1410,7 @@ static QDF_STATUS csr_roam_open(tpAniSirGlobal mac) return status; } -static QDF_STATUS csr_roam_close(tpAniSirGlobal mac) +static QDF_STATUS csr_roam_close(struct mac_context *mac) { uint32_t sessionId; @@ -1429,13 +1429,13 @@ static QDF_STATUS csr_roam_close(tpAniSirGlobal mac) return QDF_STATUS_SUCCESS; } -QDF_STATUS csr_roam_start(tpAniSirGlobal mac) +QDF_STATUS csr_roam_start(struct mac_context *mac) { (void)mac; return QDF_STATUS_SUCCESS; } -void csr_roam_stop(tpAniSirGlobal mac, uint32_t sessionId) +void csr_roam_stop(struct mac_context *mac, uint32_t sessionId) { csr_roam_stop_roaming_timer(mac, sessionId); /* deregister the clients requesting stats from PE/TL & also stop @@ -1444,7 +1444,7 @@ void csr_roam_stop(tpAniSirGlobal mac, uint32_t sessionId) csr_roam_dereg_statistics_req(mac); } -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) { QDF_STATUS status = QDF_STATUS_E_INVAL; @@ -1456,7 +1456,7 @@ QDF_STATUS csr_roam_get_connect_state(tpAniSirGlobal mac, uint32_t sessionId, return status; } -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) { QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -1533,7 +1533,7 @@ QDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal mac, return status; } -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) { QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -1559,7 +1559,7 @@ void csr_roam_free_connect_profile(tCsrRoamConnectedProfile *profile) profile->AuthType = eCSR_AUTH_TYPE_UNKNOWN; } -static QDF_STATUS csr_roam_free_connected_info(tpAniSirGlobal mac, +static QDF_STATUS csr_roam_free_connected_info(struct mac_context *mac, struct csr_roam_connectedinfo * pConnectedInfo) { @@ -1580,18 +1580,18 @@ static QDF_STATUS csr_roam_free_connected_info(tpAniSirGlobal mac, return status; } -void csr_release_command_roam(tpAniSirGlobal mac, tSmeCmd *pCommand) +void csr_release_command_roam(struct mac_context *mac, tSmeCmd *pCommand) { csr_reinit_roam_cmd(mac, pCommand); } -void csr_release_command_wm_status_change(tpAniSirGlobal mac, +void csr_release_command_wm_status_change(struct mac_context *mac, tSmeCmd *pCommand) { csr_reinit_wm_status_change_cmd(mac, pCommand); } -void csr_roam_substate_change(tpAniSirGlobal mac, +void csr_roam_substate_change(struct mac_context *mac, enum csr_roam_substate NewSubstate, uint32_t sessionId) { if (sessionId >= CSR_ROAM_SESSION_MAX) { @@ -1610,7 +1610,7 @@ void csr_roam_substate_change(tpAniSirGlobal mac, spin_unlock(&mac->roam.roam_state_lock); } -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) { @@ -1635,7 +1635,7 @@ enum csr_roam_state csr_roam_state_change(tpAniSirGlobal mac, return PreviousState; } -void csr_assign_rssi_for_category(tpAniSirGlobal mac, int8_t bestApRssi, +void csr_assign_rssi_for_category(struct mac_context *mac, int8_t bestApRssi, uint8_t catOffset) { int i; @@ -1653,7 +1653,7 @@ void csr_assign_rssi_for_category(tpAniSirGlobal mac, int8_t bestApRssi, } } -static void init_config_param(tpAniSirGlobal mac) +static void init_config_param(struct mac_context *mac) { int i; @@ -1715,7 +1715,7 @@ enum band_info csr_get_current_band(struct mac_context *mac) } /* This function flushes the roam scan cache */ -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 status = QDF_STATUS_SUCCESS; @@ -1737,7 +1737,7 @@ QDF_STATUS csr_flush_cfg_bg_scan_roam_channel_list(tpAniSirGlobal mac, * This function flushes the roam scan cache and creates fresh cache * based on the input channel list */ -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) @@ -1784,7 +1784,7 @@ QDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal mac, * * Return: QDF_STATUS enumeration */ -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, @@ -1894,7 +1894,7 @@ QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal mac, * * Return: true if ese association; false otherwise */ -bool csr_roam_is_ese_assoc(tpAniSirGlobal mac_ctx, uint32_t session_id) +bool csr_roam_is_ese_assoc(struct mac_context *mac_ctx, uint32_t session_id) { return mac_ctx->roam.neighborRoamInfo[session_id].isESEAssoc; } @@ -1906,7 +1906,7 @@ bool csr_roam_is_ese_assoc(tpAniSirGlobal mac_ctx, uint32_t session_id) * * Return: true if ese feature is enabled; false otherwise */ -bool csr_roam_is_ese_ini_feature_enabled(tpAniSirGlobal mac) +bool csr_roam_is_ese_ini_feature_enabled(struct mac_context *mac) { return mac->mlme_cfg->lfr.ese_enabled; } @@ -1918,7 +1918,7 @@ bool csr_roam_is_ese_ini_feature_enabled(tpAniSirGlobal mac) * * Return: None */ -static void csr_tsm_stats_rsp_processor(tpAniSirGlobal mac, void *pMsg) +static void csr_tsm_stats_rsp_processor(struct mac_context *mac, void *pMsg) { tAniGetTsmStatsRsp *pTsmStatsRsp = (tAniGetTsmStatsRsp *) pMsg; @@ -1962,7 +1962,7 @@ static void csr_tsm_stats_rsp_processor(tpAniSirGlobal mac, void *pMsg) * * Return: None */ -static void csr_send_ese_adjacent_ap_rep_ind(tpAniSirGlobal mac, +static void csr_send_ese_adjacent_ap_rep_ind(struct mac_context *mac, struct csr_roam_session *pSession) { uint32_t roamTS2 = 0; @@ -2007,7 +2007,7 @@ static void csr_send_ese_adjacent_ap_rep_ind(tpAniSirGlobal mac, * * Return: QDF_STATUS enumeration */ -QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal mac, +QDF_STATUS csr_get_tsm_stats(struct mac_context *mac, tCsrTsmStatsCallback callback, uint8_t staId, struct qdf_mac_addr bssId, @@ -2051,7 +2051,7 @@ QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal mac, * Return: void */ static void -csr_fetch_ch_lst_from_received_list(tpAniSirGlobal mac_ctx, +csr_fetch_ch_lst_from_received_list(struct mac_context *mac_ctx, tpCsrNeighborRoamControlInfo roam_info, tpCsrChannelInfo curr_ch_lst_info, tSirRoamOffloadScanReq *req_buf) @@ -2130,7 +2130,7 @@ csr_fetch_ch_lst_from_received_list(tpAniSirGlobal mac_ctx, * * Return: QDF_STATUS enumeration */ -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 status = QDF_STATUS_SUCCESS; @@ -2157,7 +2157,7 @@ QDF_STATUS csr_set_cckm_ie(tpAniSirGlobal mac, const uint8_t sessionId, * * Return: QDF_STATUS enumeration */ -QDF_STATUS csr_roam_read_tsf(tpAniSirGlobal mac, uint8_t *pTimestamp, +QDF_STATUS csr_roam_read_tsf(struct mac_context *mac, uint8_t *pTimestamp, uint8_t sessionId) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -2194,7 +2194,7 @@ QDF_STATUS csr_roam_read_tsf(tpAniSirGlobal mac, uint8_t *pTimestamp, * * Return: true if roam offload scan enabled; false otherwise */ -bool csr_roam_is_roam_offload_scan_enabled(tpAniSirGlobal mac_ctx) +bool csr_roam_is_roam_offload_scan_enabled(struct mac_context *mac_ctx) { return mac_ctx->mlme_cfg->lfr.roam_scan_offload_enabled; } @@ -2330,7 +2330,7 @@ uint32_t csr_convert_phy_cb_state_to_ini_value(ePhyChanBondState phyCbState) * * Return: None */ -static void csr_update_he_config_param(tpAniSirGlobal mac_ctx, +static void csr_update_he_config_param(struct mac_context *mac_ctx, tCsrConfigParam *param) { mac_ctx->roam.configParam.enable_ul_ofdma = param->enable_ul_ofdma; @@ -2345,7 +2345,7 @@ static void csr_update_he_config_param(tpAniSirGlobal mac_ctx, * Return: None */ static void csr_get_he_config_param(tCsrConfigParam *param, - tpAniSirGlobal mac_ctx) + struct mac_context *mac_ctx) { param->enable_ul_ofdma = mac_ctx->roam.configParam.enable_ul_ofdma; param->enable_ul_mimo = mac_ctx->roam.configParam.enable_ul_mimo; @@ -2380,7 +2380,7 @@ static void csr_start_bss_copy_he_cap(tSirSmeStartBssReq *req, sizeof(session->he_config)); } -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) { tDot11fIEhe_cap *he_cap = &session->he_config; @@ -2407,13 +2407,13 @@ void csr_update_session_he_cap(tpAniSirGlobal mac_ctx, #else #define CSR_REVISE_REQ_HE_CAP_PER_BAND(_req, _pmac, _channelid) /* no op */ -static inline void csr_update_he_config_param(tpAniSirGlobal mac_ctx, +static inline void csr_update_he_config_param(struct mac_context *mac_ctx, tCsrConfigParam *param) { } static inline void csr_get_he_config_param(tCsrConfigParam *param, - tpAniSirGlobal mac_ctx) + struct mac_context *mac_ctx) { } @@ -2464,7 +2464,7 @@ void csr_set_11k_offload_config_param(struct csr_config *csr_config, } static void -csr_copy_mawc_config(tpAniSirGlobal mac, +csr_copy_mawc_config(struct mac_context *mac, struct mawc_params *mawc_config) { mawc_config->mawc_enabled = @@ -2481,7 +2481,7 @@ csr_copy_mawc_config(tpAniSirGlobal mac, mac->mlme_cfg->lfr.mawc_roam_rssi_low_adjust; } -QDF_STATUS csr_change_default_config_param(tpAniSirGlobal mac, +QDF_STATUS csr_change_default_config_param(struct mac_context *mac, tCsrConfigParam *pParam) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -2801,7 +2801,7 @@ void csr_get_11k_offload_config_param(struct csr_config *csr_config, max_neighbor_report_req_cap; } -QDF_STATUS csr_get_config_param(tpAniSirGlobal mac, tCsrConfigParam *pParam) +QDF_STATUS csr_get_config_param(struct mac_context *mac, tCsrConfigParam *pParam) { int i; struct csr_config *cfg_params = &mac->roam.configParam; @@ -2979,7 +2979,7 @@ static void csr_prune_ch_list(struct csr_channel *ch_lst, bool is_24_GHz) * * Return: void */ -void csr_prune_channel_list_for_mode(tpAniSirGlobal mac_ctx, +void csr_prune_channel_list_for_mode(struct mac_context *mac_ctx, struct csr_channel *ch_lst) { /* for dual band NICs, don't need to trim the channel list.... */ @@ -2996,7 +2996,7 @@ void csr_prune_channel_list_for_mode(tpAniSirGlobal mac_ctx, } #define INFRA_AP_DEFAULT_CHANNEL 6 -QDF_STATUS csr_is_valid_channel(tpAniSirGlobal mac, uint8_t chnNum) +QDF_STATUS csr_is_valid_channel(struct mac_context *mac, uint8_t chnNum) { uint8_t index = 0; QDF_STATUS status = QDF_STATUS_E_NOSUPPORT; @@ -3039,7 +3039,7 @@ QDF_STATUS csr_is_valid_channel(tpAniSirGlobal mac, uint8_t chnNum) return status; } -QDF_STATUS csr_get_channel_and_power_list(tpAniSirGlobal mac) +QDF_STATUS csr_get_channel_and_power_list(struct mac_context *mac) { QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t num20MHzChannelsFound = 0; @@ -3069,7 +3069,7 @@ QDF_STATUS csr_get_channel_and_power_list(tpAniSirGlobal mac) return status; } -QDF_STATUS csr_apply_channel_and_power_list(tpAniSirGlobal mac) +QDF_STATUS csr_apply_channel_and_power_list(struct mac_context *mac) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -3084,7 +3084,7 @@ QDF_STATUS csr_apply_channel_and_power_list(tpAniSirGlobal mac) return status; } -static QDF_STATUS csr_init11d_info(tpAniSirGlobal mac, tCsr11dinfo *ps11dinfo) +static QDF_STATUS csr_init11d_info(struct mac_context *mac, tCsr11dinfo *ps11dinfo) { QDF_STATUS status = QDF_STATUS_E_FAILURE; uint8_t index; @@ -3173,7 +3173,7 @@ static QDF_STATUS csr_init11d_info(tpAniSirGlobal mac, tCsr11dinfo *ps11dinfo) } /* Initialize the Channel + Power List in the local cache and in the CFG */ -QDF_STATUS csr_init_channel_power_list(tpAniSirGlobal mac, +QDF_STATUS csr_init_channel_power_list(struct mac_context *mac, tCsr11dinfo *ps11dinfo) { uint8_t index; @@ -3229,7 +3229,7 @@ QDF_STATUS csr_init_channel_power_list(tpAniSirGlobal mac, * Return: void */ static void csr_roam_remove_duplicate_pending_cmd_from_list( - tpAniSirGlobal mac_ctx, + struct mac_context *mac_ctx, uint32_t session_id, tSmeCmd *command, enum csr_roam_reason roam_reason) { @@ -3313,7 +3313,7 @@ static void csr_roam_remove_duplicate_pending_cmd_from_list( * * Return: void */ -void csr_roam_remove_duplicate_command(tpAniSirGlobal mac_ctx, +void csr_roam_remove_duplicate_command(struct mac_context *mac_ctx, uint32_t session_id, tSmeCmd *command, enum csr_roam_reason roam_reason) { @@ -3457,7 +3457,7 @@ static const char *csr_get_encr_type_str(uint8_t encr_type) } } -static void csr_dump_connection_stats(tpAniSirGlobal mac_ctx, +static void csr_dump_connection_stats(struct mac_context *mac_ctx, struct csr_roam_session *session, struct csr_roam_info *roam_info, eRoamCmdStatus u1, eCsrRoamResult u2) @@ -3524,7 +3524,7 @@ static void csr_dump_connection_stats(tpAniSirGlobal mac_ctx, WLAN_HOST_DIAG_EVENT_REPORT(&conn_stats, EVENT_WLAN_CONN_STATS_V2); } -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) @@ -3600,7 +3600,7 @@ void csr_get_sta_cxn_info(tpAniSirGlobal mac_ctx, ((hw_mode != 0) ? "yes" : "no")); } #else -static void csr_dump_connection_stats(tpAniSirGlobal mac_ctx, +static void csr_dump_connection_stats(struct mac_context *mac_ctx, struct csr_roam_session *session, struct csr_roam_info *roam_info, eRoamCmdStatus u1, eCsrRoamResult u2) @@ -3608,7 +3608,7 @@ static void csr_dump_connection_stats(tpAniSirGlobal mac_ctx, #endif -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) @@ -3810,13 +3810,13 @@ QDF_STATUS csr_roam_call_callback(tpAniSirGlobal mac, uint32_t sessionId, /* Returns whether handoff is currently in progress or not */ static -bool csr_roam_is_handoff_in_progress(tpAniSirGlobal mac, uint8_t sessionId) +bool csr_roam_is_handoff_in_progress(struct mac_context *mac, uint8_t sessionId) { return csr_neighbor_roam_is_handoff_in_progress(mac, sessionId); } static -QDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal mac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_disassociate(struct mac_context *mac, uint32_t sessionId, enum csr_roam_substate NewSubstate, bool fMICFailure) { @@ -3892,7 +3892,7 @@ QDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal mac, uint32_t sessionId, * * 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) @@ -3933,7 +3933,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) { @@ -3964,7 +3964,7 @@ QDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal mac, } QDF_STATUS -csr_roam_get_associated_stas(tpAniSirGlobal mac, uint32_t sessionId, +csr_roam_get_associated_stas(struct mac_context *mac, uint32_t sessionId, QDF_MODULE_ID modId, void *pUsrContext, void *pfnSapEventCallback, uint8_t *pAssocStasBuf) { @@ -3995,7 +3995,7 @@ csr_roam_get_associated_stas(tpAniSirGlobal mac, uint32_t sessionId, } static -QDF_STATUS csr_roam_issue_deauth(tpAniSirGlobal mac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_deauth(struct mac_context *mac, uint32_t sessionId, enum csr_roam_substate NewSubstate) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -4029,7 +4029,7 @@ QDF_STATUS csr_roam_issue_deauth(tpAniSirGlobal mac, uint32_t sessionId, return status; } -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) { @@ -4071,7 +4071,7 @@ QDF_STATUS csr_roam_save_connected_bss_desc(tpAniSirGlobal mac, } static -QDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal mac, +QDF_STATUS csr_roam_prepare_bss_config(struct mac_context *mac, struct csr_roam_profile *pProfile, tSirBssDescription *pBssDesc, struct bss_config_param *pBssConfig, @@ -4231,7 +4231,7 @@ QDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal mac, } QDF_STATUS csr_roam_prepare_bss_config_from_profile( - tpAniSirGlobal mac, struct csr_roam_profile *pProfile, + struct mac_context *mac, struct csr_roam_profile *pProfile, struct bss_config_param *pBssConfig, tSirBssDescription *pBssDesc) { @@ -4337,7 +4337,7 @@ QDF_STATUS csr_roam_prepare_bss_config_from_profile( return status; } -static QDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal mac, +static QDF_STATUS csr_roam_get_qos_info_from_bss(struct mac_context *mac, tSirBssDescription *pBssDesc) { QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -4361,7 +4361,7 @@ static QDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal mac, return status; } -void csr_set_cfg_privacy(tpAniSirGlobal mac, struct csr_roam_profile *pProfile, +void csr_set_cfg_privacy(struct mac_context *mac, struct csr_roam_profile *pProfile, bool fPrivacy) { /* @@ -4533,7 +4533,7 @@ void csr_set_cfg_privacy(tpAniSirGlobal mac, struct csr_roam_profile *pProfile, mac->mlme_cfg->wep_params.wep_default_key_id = wep_default_key_id; } -static void csr_set_cfg_ssid(tpAniSirGlobal mac, tSirMacSSid *pSSID) +static void csr_set_cfg_ssid(struct mac_context *mac, tSirMacSSid *pSSID) { uint32_t len = 0; @@ -4548,7 +4548,7 @@ static void csr_set_cfg_ssid(tpAniSirGlobal mac, tSirMacSSid *pSSID) } -static QDF_STATUS csr_set_qos_to_cfg(tpAniSirGlobal mac, uint32_t sessionId, +static QDF_STATUS csr_set_qos_to_cfg(struct mac_context *mac, uint32_t sessionId, eCsrMediaAccessType qosType) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -4590,7 +4590,7 @@ static QDF_STATUS csr_set_qos_to_cfg(tpAniSirGlobal mac, uint32_t sessionId, return status; } -static QDF_STATUS csr_get_rate_set(tpAniSirGlobal mac, +static QDF_STATUS csr_get_rate_set(struct mac_context *mac, struct csr_roam_profile *pProfile, eCsrPhyMode phyMode, tSirBssDescription *pBssDesc, @@ -4665,7 +4665,7 @@ static QDF_STATUS csr_get_rate_set(tpAniSirGlobal mac, return status; } -static void csr_set_cfg_rate_set(tpAniSirGlobal mac, eCsrPhyMode phyMode, +static void csr_set_cfg_rate_set(struct mac_context *mac, eCsrPhyMode phyMode, struct csr_roam_profile *pProfile, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes) @@ -4767,7 +4767,7 @@ static void csr_set_cfg_rate_set(tpAniSirGlobal mac, eCsrPhyMode phyMode, sme_err("failed to parse BssDesc"); } -static void csr_set_cfg_rate_set_from_profile(tpAniSirGlobal mac, +static void csr_set_cfg_rate_set_from_profile(struct mac_context *mac, struct csr_roam_profile *pProfile) { tSirMacRateSetIE DefaultSupportedRates11a = { SIR_MAC_RATESET_EID, @@ -4858,7 +4858,7 @@ static void csr_set_cfg_rate_set_from_profile(tpAniSirGlobal mac, ExtendedOperationalRatesLength); } -static void csr_roam_ccm_cfg_set_callback(tpAniSirGlobal mac, +static void csr_roam_ccm_cfg_set_callback(struct mac_context *mac, uint8_t session_id) { tListElem *pEntry = @@ -4890,7 +4890,7 @@ static void csr_roam_ccm_cfg_set_callback(tpAniSirGlobal mac, } /* pIes may be NULL */ -QDF_STATUS csr_roam_set_bss_config_cfg(tpAniSirGlobal mac, uint32_t sessionId, +QDF_STATUS csr_roam_set_bss_config_cfg(struct mac_context *mac, uint32_t sessionId, struct csr_roam_profile *pProfile, tSirBssDescription *pBssDesc, struct bss_config_param *pBssConfig, @@ -4979,7 +4979,7 @@ QDF_STATUS csr_roam_set_bss_config_cfg(tpAniSirGlobal mac, uint32_t sessionId, } static -QDF_STATUS csr_roam_stop_network(tpAniSirGlobal mac, uint32_t sessionId, +QDF_STATUS csr_roam_stop_network(struct mac_context *mac, uint32_t sessionId, struct csr_roam_profile *pProfile, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes) @@ -5078,7 +5078,7 @@ QDF_STATUS csr_roam_stop_network(tpAniSirGlobal mac, uint32_t sessionId, * Return: Roaming state. */ static enum csr_join_state csr_roam_state_for_same_profile( - tpAniSirGlobal mac_ctx, struct csr_roam_profile *profile, + struct mac_context *mac_ctx, struct csr_roam_profile *profile, struct csr_roam_session *session, uint32_t session_id, tDot11fBeaconIEs *ies_local, tSirBssDescription *bss_descr) @@ -5110,7 +5110,7 @@ static enum csr_join_state csr_roam_state_for_same_profile( } -static enum csr_join_state csr_roam_join(tpAniSirGlobal mac, +static enum csr_join_state csr_roam_join(struct mac_context *mac, uint32_t sessionId, tCsrScanResultInfo *pScanResult, struct csr_roam_profile *pProfile) { @@ -5188,7 +5188,7 @@ static enum csr_join_state csr_roam_join(tpAniSirGlobal mac, } static -QDF_STATUS csr_roam_should_roam(tpAniSirGlobal mac, uint32_t sessionId, +QDF_STATUS csr_roam_should_roam(struct mac_context *mac, uint32_t sessionId, tSirBssDescription *pBssDesc, uint32_t roamId) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -5202,7 +5202,7 @@ QDF_STATUS csr_roam_should_roam(tpAniSirGlobal mac, uint32_t sessionId, } /* In case no matching BSS is found, use whatever default we can find */ -static void csr_roam_assign_default_param(tpAniSirGlobal mac, +static void csr_roam_assign_default_param(struct mac_context *mac, tSmeCmd *pCommand) { /* Need to get all negotiated types in place first */ @@ -5257,7 +5257,7 @@ static void csr_roam_assign_default_param(tpAniSirGlobal mac, * * Return: true if the entire BSS list is done, false otherwise. */ -static bool csr_roam_select_bss(tpAniSirGlobal mac_ctx, +static bool csr_roam_select_bss(struct mac_context *mac_ctx, tListElem *roam_bss_entry, tCsrScanResultInfo **csr_result_info, struct tag_csrscan_result **csr_scan_result, uint32_t session_id, uint32_t roam_id, @@ -5326,7 +5326,7 @@ static bool csr_roam_select_bss(tpAniSirGlobal mac_ctx, * * Return: None */ -static void csr_roam_join_handle_profile(tpAniSirGlobal mac_ctx, +static void csr_roam_join_handle_profile(struct mac_context *mac_ctx, uint32_t session_id, tSmeCmd *cmd, struct csr_roam_info *roam_info_ptr, enum csr_join_state *roam_state, tCsrScanResultInfo *result, @@ -5498,7 +5498,7 @@ static void csr_roam_join_handle_profile(tpAniSirGlobal mac_ctx, * * Return: The Join State */ -static enum csr_join_state csr_roam_join_next_bss(tpAniSirGlobal mac_ctx, +static enum csr_join_state csr_roam_join_next_bss(struct mac_context *mac_ctx, tSmeCmd *cmd, bool use_same_bss) { struct tag_csrscan_result *scan_result = NULL; @@ -5592,7 +5592,7 @@ end: return roam_state; } -static QDF_STATUS csr_roam(tpAniSirGlobal mac, tSmeCmd *pCommand) +static QDF_STATUS csr_roam(struct mac_context *mac, tSmeCmd *pCommand) { QDF_STATUS status = QDF_STATUS_SUCCESS; enum csr_join_state RoamState; @@ -5673,7 +5673,7 @@ static QDF_STATUS csr_roam(tpAniSirGlobal mac, tSmeCmd *pCommand) } static -QDF_STATUS csr_process_ft_reassoc_roam_command(tpAniSirGlobal mac, +QDF_STATUS csr_process_ft_reassoc_roam_command(struct mac_context *mac, tSmeCmd *pCommand) { uint32_t sessionId; @@ -5727,7 +5727,7 @@ QDF_STATUS csr_process_ft_reassoc_roam_command(tpAniSirGlobal mac, * Return: QDF_STATUS for success or failure. */ static QDF_STATUS csr_roam_trigger_reassociate( -tpAniSirGlobal mac_ctx, tSmeCmd *cmd, struct csr_roam_info *roam_info, +struct mac_context *mac_ctx, tSmeCmd *cmd, struct csr_roam_info *roam_info, struct csr_roam_session *session_ptr, uint32_t session_id) { @@ -5778,7 +5778,7 @@ tpAniSirGlobal mac_ctx, tSmeCmd *cmd, struct csr_roam_info *roam_info, return status; } -QDF_STATUS csr_roam_process_command(tpAniSirGlobal mac, tSmeCmd *pCommand) +QDF_STATUS csr_roam_process_command(struct mac_context *mac, tSmeCmd *pCommand) { struct csr_roam_info roamInfo; QDF_STATUS lock_status, status = QDF_STATUS_SUCCESS; @@ -5928,7 +5928,7 @@ QDF_STATUS csr_roam_process_command(tpAniSirGlobal mac, tSmeCmd *pCommand) return status; } -void csr_reinit_roam_cmd(tpAniSirGlobal mac, tSmeCmd *pCommand) +void csr_reinit_roam_cmd(struct mac_context *mac, tSmeCmd *pCommand) { if (pCommand->u.roamCmd.fReleaseBssList) { csr_scan_result_purge(mac, pCommand->u.roamCmd.hBSSList); @@ -5945,7 +5945,7 @@ void csr_reinit_roam_cmd(tpAniSirGlobal mac, tSmeCmd *pCommand) qdf_mem_set(&pCommand->u.roamCmd, sizeof(struct roam_cmd), 0); } -void csr_reinit_wm_status_change_cmd(tpAniSirGlobal mac, +void csr_reinit_wm_status_change_cmd(struct mac_context *mac, tSmeCmd *pCommand) { qdf_mem_set(&pCommand->u.wmStatusChangeCmd, sizeof( @@ -5953,7 +5953,7 @@ void csr_reinit_wm_status_change_cmd(tpAniSirGlobal mac, 0); } -void csr_roam_complete(tpAniSirGlobal mac_ctx, +void csr_roam_complete(struct mac_context *mac_ctx, enum csr_roamcomplete_result Result, void *Context, uint8_t session_id) { @@ -5978,7 +5978,7 @@ void csr_roam_complete(tpAniSirGlobal mac_ctx, } -void csr_reset_pmkid_candidate_list(tpAniSirGlobal mac, +void csr_reset_pmkid_candidate_list(struct mac_context *mac, uint32_t sessionId) { struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId); @@ -5993,7 +5993,7 @@ void csr_reset_pmkid_candidate_list(tpAniSirGlobal mac, } #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) { struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId); @@ -6019,7 +6019,7 @@ void csr_reset_bkid_candidate_list(tpAniSirGlobal mac, uint32_t sessionId) * * Return: none. */ -static QDF_STATUS csr_roam_save_params(tpAniSirGlobal mac_ctx, +static QDF_STATUS csr_roam_save_params(struct mac_context *mac_ctx, struct csr_roam_session *session_ptr, eCsrAuthType auth_type, tDot11fBeaconIEs *ie_ptr, @@ -6190,7 +6190,7 @@ static QDF_STATUS csr_roam_save_params(tpAniSirGlobal mac_ctx, return QDF_STATUS_SUCCESS; } -static QDF_STATUS csr_roam_save_security_rsp_ie(tpAniSirGlobal mac, +static QDF_STATUS csr_roam_save_security_rsp_ie(struct mac_context *mac, uint32_t sessionId, eCsrAuthType authType, tSirBssDescription *pSirBssDesc, @@ -6237,13 +6237,13 @@ static QDF_STATUS csr_roam_save_security_rsp_ie(tpAniSirGlobal mac, } /* 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) { return csr_neighbor_roam_is11r_assoc(mac, sessionId); } /* Returns whether "Legacy Fast Roaming" is currently enabled...or not */ -bool csr_roam_is_fast_roam_enabled(tpAniSirGlobal mac, uint32_t sessionId) +bool csr_roam_is_fast_roam_enabled(struct mac_context *mac, uint32_t sessionId) { struct csr_roam_session *pSession = NULL; @@ -6264,7 +6264,7 @@ bool csr_roam_is_fast_roam_enabled(tpAniSirGlobal mac, uint32_t sessionId) } } -static void csr_update_scan_entry_associnfo(tpAniSirGlobal mac_ctx, +static void csr_update_scan_entry_associnfo(struct mac_context *mac_ctx, struct bss_info *bss, enum scan_entry_connection_state state) { QDF_STATUS status; @@ -6326,7 +6326,7 @@ static eCsrPhyMode csr_roamdot11mode_to_phymode(uint8_t dot11mode) #endif #ifdef WLAN_FEATURE_ROAM_OFFLOAD -static void csr_roam_synch_clean_up(tpAniSirGlobal mac, uint8_t session_id) +static void csr_roam_synch_clean_up(struct mac_context *mac, uint8_t session_id) { struct scheduler_msg msg = {0}; struct roam_offload_synch_fail *roam_offload_failed = NULL; @@ -6415,7 +6415,7 @@ static inline void csr_update_fils_seq_number(struct csr_roam_session *session, * * Return: None */ -static void csr_roam_process_results_default(tpAniSirGlobal mac_ctx, +static void csr_roam_process_results_default(struct mac_context *mac_ctx, tSmeCmd *cmd, void *context, enum csr_roamcomplete_result res) { @@ -6623,7 +6623,7 @@ static void csr_roam_process_results_default(tpAniSirGlobal mac_ctx, * * Return: None */ -static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx, +static void csr_roam_process_start_bss_success(struct mac_context *mac_ctx, tSmeCmd *cmd, void *context) { uint32_t session_id = cmd->sessionId; @@ -6836,7 +6836,7 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx, * * Return: QDF_STATUS */ -static QDF_STATUS populate_fils_params_join_rsp(tpAniSirGlobal mac_ctx, +static QDF_STATUS populate_fils_params_join_rsp(struct mac_context *mac_ctx, struct csr_roam_info *roam_info, tSirSmeJoinRsp *join_rsp) { @@ -6917,7 +6917,7 @@ free_fils_join_rsp: * * Return: None */ -static void csr_process_fils_join_rsp(tpAniSirGlobal mac_ctx, +static void csr_process_fils_join_rsp(struct mac_context *mac_ctx, struct csr_roam_profile *profile, uint32_t session_id, struct csr_roam_info *roam_info, @@ -6967,7 +6967,7 @@ process_fils_join_rsp_fail: } #else -static inline void csr_process_fils_join_rsp(tpAniSirGlobal mac_ctx, +static inline void csr_process_fils_join_rsp(struct mac_context *mac_ctx, struct csr_roam_profile *profile, uint32_t session_id, struct csr_roam_info *roam_info, @@ -6987,7 +6987,7 @@ static inline void csr_process_fils_join_rsp(tpAniSirGlobal mac_ctx, * * Return: None */ -static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, +static void csr_roam_process_join_res(struct mac_context *mac_ctx, enum csr_roamcomplete_result res, tSmeCmd *cmd, void *context) { tSirMacAddr bcast_mac = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; @@ -7401,7 +7401,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, * * Return: true if the command can be released, else not. */ -static bool csr_roam_process_results(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, +static bool csr_roam_process_results(struct mac_context *mac_ctx, tSmeCmd *cmd, enum csr_roamcomplete_result res, void *context) { @@ -7611,7 +7611,7 @@ void update_profile_fils_info(struct csr_roam_profile *des_profile, struct csr_roam_profile *src_profile) { } #endif -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) { @@ -7816,7 +7816,7 @@ end: return status; } -QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal mac, +QDF_STATUS csr_roam_copy_connected_profile(struct mac_context *mac, uint32_t sessionId, struct csr_roam_profile *pDstProfile) { @@ -7903,7 +7903,7 @@ end: return status; } -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, @@ -7966,7 +7966,7 @@ QDF_STATUS csr_roam_issue_connect(tpAniSirGlobal mac, uint32_t sessionId, return status; } -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 *pMmodProfileFields, @@ -8024,7 +8024,7 @@ QDF_STATUS csr_roam_issue_reassoc(tpAniSirGlobal mac, uint32_t sessionId, return status; } -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) { @@ -8114,7 +8114,7 @@ static void csr_roam_print_candidate_aps(tScanResultHandle results) } } -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) { @@ -8344,7 +8344,7 @@ end: * Return: status of operation */ QDF_STATUS -csr_roam_reassoc(tpAniSirGlobal mac_ctx, uint32_t session_id, +csr_roam_reassoc(struct mac_context *mac_ctx, uint32_t session_id, struct csr_roam_profile *profile, tCsrRoamModifyProfileFields mod_fields, uint32_t *roam_id) @@ -8411,7 +8411,7 @@ csr_roam_reassoc(tpAniSirGlobal mac_ctx, uint32_t session_id, return status; } -static QDF_STATUS csr_roam_join_last_profile(tpAniSirGlobal mac, +static QDF_STATUS csr_roam_join_last_profile(struct mac_context *mac, uint32_t sessionId) { QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -8487,7 +8487,7 @@ end: return status; } -QDF_STATUS csr_roam_reconnect(tpAniSirGlobal mac, uint32_t sessionId) +QDF_STATUS csr_roam_reconnect(struct mac_context *mac, uint32_t sessionId) { QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -8500,7 +8500,7 @@ QDF_STATUS csr_roam_reconnect(tpAniSirGlobal mac, uint32_t sessionId) return status; } -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) { QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -8513,7 +8513,7 @@ QDF_STATUS csr_roam_connect_to_last_profile(tpAniSirGlobal mac, return status; } -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) { @@ -8619,7 +8619,7 @@ QDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal mac, * Return: QDF_STATUS_SUCCESS on success else QDF_STATUS_E_RESOURCES on failure */ -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) { tSmeCmd *command; @@ -8638,7 +8638,7 @@ QDF_STATUS csr_prepare_disconnect_command(tpAniSirGlobal mac, return QDF_STATUS_SUCCESS; } -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) { @@ -8707,7 +8707,7 @@ QDF_STATUS csr_roam_issue_disassociate_cmd(tpAniSirGlobal mac, return status; } -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) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -8734,7 +8734,7 @@ QDF_STATUS csr_roam_issue_stop_bss_cmd(tpAniSirGlobal mac, uint32_t sessionId, return status; } -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) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -8769,7 +8769,7 @@ QDF_STATUS csr_roam_disconnect_internal(tpAniSirGlobal mac, uint32_t sessionId, return status; } -QDF_STATUS csr_roam_disconnect(tpAniSirGlobal mac_ctx, uint32_t session_id, +QDF_STATUS csr_roam_disconnect(struct mac_context *mac_ctx, uint32_t session_id, eCsrRoamDisconnectReason reason) { struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id); @@ -8787,7 +8787,7 @@ QDF_STATUS csr_roam_disconnect(tpAniSirGlobal mac_ctx, uint32_t session_id, return csr_roam_disconnect_internal(mac_ctx, session_id, reason); } -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, @@ -8937,7 +8937,7 @@ QDF_STATUS csr_roam_save_connected_information(tpAniSirGlobal mac, } -bool is_disconnect_pending(tpAniSirGlobal pmac, +bool is_disconnect_pending(struct mac_context *pmac, uint8_t sessionid) { tListElem *entry = NULL; @@ -8963,7 +8963,7 @@ bool is_disconnect_pending(tpAniSirGlobal pmac, return disconnect_cmd_exist; } -static void csr_roam_join_rsp_processor(tpAniSirGlobal mac, +static void csr_roam_join_rsp_processor(struct mac_context *mac, tSirSmeJoinRsp *pSmeJoinRsp) { tListElem *pEntry = NULL; @@ -9094,7 +9094,7 @@ static void csr_roam_join_rsp_processor(tpAniSirGlobal mac, } /*else: ( eSIR_SME_SUCCESS == pSmeJoinRsp->statusCode ) */ } -static QDF_STATUS csr_roam_issue_join(tpAniSirGlobal mac, uint32_t sessionId, +static QDF_STATUS csr_roam_issue_join(struct mac_context *mac, uint32_t sessionId, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, struct csr_roam_profile *pProfile, @@ -9114,7 +9114,7 @@ static QDF_STATUS csr_roam_issue_join(tpAniSirGlobal mac, uint32_t sessionId, } static void -csr_roam_reissue_roam_command(tpAniSirGlobal mac, uint8_t session_id) +csr_roam_reissue_roam_command(struct mac_context *mac, uint8_t session_id) { tListElem *pEntry; tSmeCmd *pCommand; @@ -9177,7 +9177,7 @@ csr_roam_reissue_roam_command(tpAniSirGlobal mac, uint8_t session_id) } } -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) { bool fRet = false; @@ -9216,7 +9216,7 @@ bool csr_is_roam_command_waiting_for_session(tpAniSirGlobal mac, } static void -csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx, +csr_roaming_state_config_cnf_processor(struct mac_context *mac_ctx, tSmeCmd *cmd, uint8_t sme_session_id) { @@ -9377,7 +9377,7 @@ csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx, } } -static void csr_roam_roaming_state_reassoc_rsp_processor(tpAniSirGlobal mac, +static void csr_roam_roaming_state_reassoc_rsp_processor(struct mac_context *mac, tpSirSmeJoinRsp pSmeJoinRsp) { enum csr_roamcomplete_result result; @@ -9483,7 +9483,7 @@ static void csr_roam_roaming_state_reassoc_rsp_processor(tpAniSirGlobal mac, } } -static void csr_roam_roaming_state_stop_bss_rsp_processor(tpAniSirGlobal mac, +static void csr_roam_roaming_state_stop_bss_rsp_processor(struct mac_context *mac, tSirSmeRsp *pSmeRsp) { enum csr_roamcomplete_result result_code = eCsrNothingToJoin; @@ -9527,7 +9527,7 @@ static void csr_roam_roaming_state_stop_bss_rsp_processor(tpAniSirGlobal mac, * Return: void */ static void -csr_dequeue_command(tpAniSirGlobal mac_ctx) +csr_dequeue_command(struct mac_context *mac_ctx) { bool fRemoveCmd; tSmeCmd *cmd = NULL; @@ -9576,7 +9576,7 @@ csr_dequeue_command(tpAniSirGlobal mac_ctx) * Return: void */ static void -csr_post_roam_failure(tpAniSirGlobal mac_ctx, +csr_post_roam_failure(struct mac_context *mac_ctx, uint32_t session_id, struct csr_roam_info *roam_info, tCsrScanResultFilter *scan_filter, @@ -9627,7 +9627,7 @@ csr_post_roam_failure(tpAniSirGlobal mac_ctx, * Return: true if found else false. */ static bool -csr_check_profile_in_scan_cache(tpAniSirGlobal mac_ctx, +csr_check_profile_in_scan_cache(struct mac_context *mac_ctx, tCsrScanResultFilter **scan_filter, tpCsrNeighborRoamControlInfo neighbor_roam_info, tScanResultHandle *hBSSList) @@ -9658,7 +9658,7 @@ csr_check_profile_in_scan_cache(tpAniSirGlobal mac_ctx, } static -void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal mac, +void csr_roam_roaming_state_disassoc_rsp_processor(struct mac_context *mac, tSirSmeDisassocRsp *pSmeRsp) { tScanResultHandle hBSSList; @@ -9810,7 +9810,7 @@ POST_ROAM_FAILURE: qdf_mem_free(roamInfo); } -static void csr_roam_roaming_state_deauth_rsp_processor(tpAniSirGlobal mac, +static void csr_roam_roaming_state_deauth_rsp_processor(struct mac_context *mac, tSirSmeDeauthRsp *pSmeRsp) { tSirResultCodes statusCode; @@ -9837,7 +9837,7 @@ static void csr_roam_roaming_state_deauth_rsp_processor(tpAniSirGlobal mac, } } -static void csr_roam_roaming_state_start_bss_rsp_processor(tpAniSirGlobal mac, +static void csr_roam_roaming_state_start_bss_rsp_processor(struct mac_context *mac, tSirSmeStartBssRsp * pSmeStartBssRsp) { @@ -9869,7 +9869,7 @@ static void csr_roam_roaming_state_start_bss_rsp_processor(tpAniSirGlobal mac, * * Return: status of operation */ -void csr_roaming_state_msg_processor(tpAniSirGlobal mac, void *pMsgBuf) +void csr_roaming_state_msg_processor(struct mac_context *mac, void *pMsgBuf) { tSirSmeRsp *pSmeRsp; tSmeIbssPeerInd *pIbssPeerInd; @@ -9989,7 +9989,7 @@ void csr_roaming_state_msg_processor(tpAniSirGlobal mac, void *pMsgBuf) } } -void csr_roam_joined_state_msg_processor(tpAniSirGlobal mac, void *pMsgBuf) +void csr_roam_joined_state_msg_processor(struct mac_context *mac, void *pMsgBuf) { tSirSmeRsp *pSirMsg = (tSirSmeRsp *) pMsgBuf; @@ -10088,7 +10088,7 @@ void csr_roam_joined_state_msg_processor(tpAniSirGlobal mac, void *pMsgBuf) } } -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, @@ -10148,7 +10148,7 @@ QDF_STATUS csr_roam_issue_set_context_req(tpAniSirGlobal mac, * Return: status of operation */ static QDF_STATUS -csr_update_key_cmd(tpAniSirGlobal mac_ctx, struct csr_roam_session *session, +csr_update_key_cmd(struct mac_context *mac_ctx, struct csr_roam_session *session, tCsrRoamSetKey *set_key, struct setkey_cmd *set_key_cmd, bool *is_key_valid) { @@ -10346,7 +10346,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, struct csr_roam_session *session, static QDF_STATUS csr_roam_issue_set_key_command( -tpAniSirGlobal mac_ctx, uint32_t session_id, +struct mac_context *mac_ctx, uint32_t session_id, tCsrRoamSetKey *set_key, uint32_t roam_id) { @@ -10401,7 +10401,7 @@ tpAniSirGlobal mac_ctx, uint32_t session_id, return status; } -QDF_STATUS csr_roam_send_set_key_cmd(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_roam_send_set_key_cmd(struct mac_context *mac_ctx, uint32_t session_id, struct setkey_cmd *set_key_cmd) { @@ -10501,7 +10501,7 @@ QDF_STATUS csr_roam_send_set_key_cmd(tpAniSirGlobal mac_ctx, return status; } -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 status; @@ -10582,7 +10582,7 @@ static void csr_update_fils_scan_filter(tCsrScanResultFilter *scan_fltr, *pScanFilter when it is done with the filter. */ QDF_STATUS -csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, +csr_roam_prepare_filter_from_profile(struct mac_context *mac_ctx, struct csr_roam_profile *profile, tCsrScanResultFilter *scan_fltr) { @@ -10741,7 +10741,7 @@ free_filter: } static -bool csr_roam_issue_wm_status_change(tpAniSirGlobal mac, uint32_t sessionId, +bool csr_roam_issue_wm_status_change(struct mac_context *mac, uint32_t sessionId, enum csr_roam_wmstatus_changetypes Type, tSirSmeRsp *pSmeRsp) { @@ -10816,7 +10816,7 @@ static QDF_STATUS csr_send_snr_request(void *pGetRssiReq) return QDF_STATUS_E_BUSY; } -static void csr_update_rssi(tpAniSirGlobal mac, void *pMsg) +static void csr_update_rssi(struct mac_context *mac, void *pMsg) { int8_t rssi = 0; tAniGetRssiReq *pGetRssiReq = (tAniGetRssiReq *) pMsg; @@ -10841,7 +10841,7 @@ static void csr_update_rssi(tpAniSirGlobal mac, void *pMsg) } -static void csr_update_snr(tpAniSirGlobal mac, void *pMsg) +static void csr_update_snr(struct mac_context *mac, void *pMsg) { tAniGetSnrReq *pGetSnrReq = (tAniGetSnrReq *) pMsg; @@ -10855,7 +10855,7 @@ static void csr_update_snr(tpAniSirGlobal mac, void *pMsg) sme_err("pGetSnrReq is NULL"); } -static QDF_STATUS csr_send_reset_ap_caps_changed(tpAniSirGlobal mac, +static QDF_STATUS csr_send_reset_ap_caps_changed(struct mac_context *mac, struct qdf_mac_addr *bssId) { tpSirResetAPCapsChange pMsg; @@ -10885,7 +10885,7 @@ static QDF_STATUS csr_send_reset_ap_caps_changed(tpAniSirGlobal mac, } static void -csr_roam_chk_lnk_assoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) +csr_roam_chk_lnk_assoc_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) { struct csr_roam_session *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; @@ -10994,7 +10994,7 @@ csr_roam_chk_lnk_assoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) * Return: True if deauth/disassoc indication can be dropped * else false */ -static bool csr_is_deauth_disassoc_already_active(tpAniSirGlobal mac_ctx, +static bool csr_is_deauth_disassoc_already_active(struct mac_context *mac_ctx, uint8_t session_id, struct qdf_mac_addr peer_macaddr) { @@ -11025,7 +11025,7 @@ static bool csr_is_deauth_disassoc_already_active(tpAniSirGlobal mac_ctx, } static void -csr_roam_chk_lnk_disassoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) +csr_roam_chk_lnk_disassoc_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) { struct csr_roam_session *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; @@ -11131,7 +11131,7 @@ csr_roam_chk_lnk_disassoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) * Return: None */ static void -csr_roam_send_disconnect_done_indication(tpAniSirGlobal mac_ctx, tSirSmeRsp +csr_roam_send_disconnect_done_indication(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) { struct sir_sme_discon_done_ind *discon_ind = @@ -11174,7 +11174,7 @@ csr_roam_send_disconnect_done_indication(tpAniSirGlobal mac_ctx, tSirSmeRsp } static void -csr_roam_chk_lnk_deauth_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) +csr_roam_chk_lnk_deauth_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) { struct csr_roam_session *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; @@ -11256,7 +11256,7 @@ csr_roam_chk_lnk_deauth_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) } static void -csr_roam_chk_lnk_swt_ch_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) +csr_roam_chk_lnk_swt_ch_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) { struct csr_roam_session *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; @@ -11334,7 +11334,7 @@ csr_roam_chk_lnk_swt_ch_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) } static void -csr_roam_chk_lnk_deauth_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) +csr_roam_chk_lnk_deauth_rsp(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) { struct csr_roam_session *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; @@ -11364,7 +11364,7 @@ csr_roam_chk_lnk_deauth_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) } static void -csr_roam_chk_lnk_disassoc_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) +csr_roam_chk_lnk_disassoc_rsp(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) { struct csr_roam_session *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; @@ -11399,7 +11399,7 @@ csr_roam_chk_lnk_disassoc_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR static void -csr_roam_diag_mic_fail(tpAniSirGlobal mac_ctx, uint32_t sessionId) +csr_roam_diag_mic_fail(struct mac_context *mac_ctx, uint32_t sessionId) { WLAN_HOST_DIAG_EVENT_DEF(secEvent, host_event_wlan_security_payload_type); @@ -11428,7 +11428,7 @@ csr_roam_diag_mic_fail(tpAniSirGlobal mac_ctx, uint32_t sessionId) #endif /* FEATURE_WLAN_DIAG_SUPPORT_CSR */ static void -csr_roam_chk_lnk_mic_fail_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) +csr_roam_chk_lnk_mic_fail_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) { uint32_t sessionId = CSR_SESSION_ID_INVALID; QDF_STATUS status; @@ -11457,7 +11457,7 @@ csr_roam_chk_lnk_mic_fail_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) } static void -csr_roam_chk_lnk_pbs_probe_req_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) +csr_roam_chk_lnk_pbs_probe_req_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) { uint32_t sessionId = CSR_SESSION_ID_INVALID; QDF_STATUS status; @@ -11480,7 +11480,7 @@ csr_roam_chk_lnk_pbs_probe_req_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR static void -csr_roam_diag_joined_new_bss(tpAniSirGlobal mac_ctx, +csr_roam_diag_joined_new_bss(struct mac_context *mac_ctx, tSirSmeNewBssInfo *pNewBss) { host_log_ibss_pkt_type *pIbssLog; @@ -11507,7 +11507,7 @@ csr_roam_diag_joined_new_bss(tpAniSirGlobal mac_ctx, #endif /* FEATURE_WLAN_DIAG_SUPPORT_CSR */ static void -csr_roam_chk_lnk_wm_status_change_ntf(tpAniSirGlobal mac_ctx, +csr_roam_chk_lnk_wm_status_change_ntf(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) { struct csr_roam_session *session; @@ -11660,7 +11660,7 @@ csr_roam_chk_lnk_wm_status_change_ntf(tpAniSirGlobal mac_ctx, } static void -csr_roam_chk_lnk_ibss_new_peer_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) +csr_roam_chk_lnk_ibss_new_peer_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) { struct csr_roam_session *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; @@ -11760,7 +11760,7 @@ callback_and_free: } static void -csr_roam_chk_lnk_ibss_peer_departed_ind(tpAniSirGlobal mac_ctx, +csr_roam_chk_lnk_ibss_peer_departed_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) { uint32_t sessionId = CSR_SESSION_ID_INVALID; @@ -11800,7 +11800,7 @@ csr_roam_chk_lnk_ibss_peer_departed_ind(tpAniSirGlobal mac_ctx, #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR static void -csr_roam_diag_set_ctx_rsp(tpAniSirGlobal mac_ctx, +csr_roam_diag_set_ctx_rsp(struct mac_context *mac_ctx, struct csr_roam_session *session, tSirSmeSetContextRsp *pRsp) { @@ -11835,7 +11835,7 @@ csr_roam_diag_set_ctx_rsp(tpAniSirGlobal mac_ctx, #endif /* FEATURE_WLAN_DIAG_SUPPORT_CSR */ static void -csr_roam_chk_lnk_set_ctx_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) +csr_roam_chk_lnk_set_ctx_rsp(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) { struct csr_roam_session *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; @@ -11943,7 +11943,7 @@ csr_roam_chk_lnk_set_ctx_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) static void -csr_roam_chk_lnk_max_assoc_exceeded(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) +csr_roam_chk_lnk_max_assoc_exceeded(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) { uint32_t sessionId = CSR_SESSION_ID_INVALID; tSmeMaxAssocInd *pSmeMaxAssocInd; @@ -11961,7 +11961,7 @@ csr_roam_chk_lnk_max_assoc_exceeded(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED); } -void csr_roam_check_for_link_status_change(tpAniSirGlobal mac, +void csr_roam_check_for_link_status_change(struct mac_context *mac, tSirSmeRsp *pSirMsg) { if (NULL == pSirMsg) { @@ -12047,7 +12047,7 @@ void csr_roam_check_for_link_status_change(tpAniSirGlobal mac, } /* end switch on message type */ } -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, @@ -12077,7 +12077,7 @@ void csr_call_roaming_completion_callback(tpAniSirGlobal mac, } /* 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) { bool fCompleted = true; @@ -12129,7 +12129,7 @@ bool csr_roam_complete_roaming(tpAniSirGlobal mac, uint32_t sessionId, return fCompleted; } -void csr_roam_cancel_roaming(tpAniSirGlobal mac, uint32_t sessionId) +void csr_roam_cancel_roaming(struct mac_context *mac, uint32_t sessionId) { struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId); @@ -12167,7 +12167,7 @@ void csr_roam_cancel_roaming(tpAniSirGlobal mac, uint32_t sessionId) void csr_roam_roaming_timer_handler(void *pv) { struct csr_timer_info *info = pv; - tpAniSirGlobal mac = info->mac; + struct mac_context *mac = info->mac; uint32_t sessionId = info->session_id; struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId); @@ -12211,7 +12211,7 @@ void csr_roam_roaming_offload_timeout_handler(void *timer_data) eCSR_DISCONNECT_REASON_UNSPECIFIED); } -QDF_STATUS csr_roam_start_roaming_timer(tpAniSirGlobal mac, uint32_t sessionId, +QDF_STATUS csr_roam_start_roaming_timer(struct mac_context *mac, uint32_t sessionId, uint32_t interval) { QDF_STATUS status; @@ -12230,7 +12230,7 @@ QDF_STATUS csr_roam_start_roaming_timer(tpAniSirGlobal mac, uint32_t sessionId, return status; } -QDF_STATUS csr_roam_stop_roaming_timer(tpAniSirGlobal mac, +QDF_STATUS csr_roam_stop_roaming_timer(struct mac_context *mac, uint32_t sessionId) { return qdf_mc_timer_stop @@ -12240,7 +12240,7 @@ QDF_STATUS csr_roam_stop_roaming_timer(tpAniSirGlobal mac, void csr_roam_wait_for_key_time_out_handler(void *pv) { struct csr_timer_info *info = pv; - tpAniSirGlobal mac = info->mac; + struct mac_context *mac = info->mac; uint8_t session_id = info->session_id; struct csr_roam_session *pSession = CSR_GET_SESSION(mac, session_id); QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -12314,7 +12314,7 @@ void csr_roam_wait_for_key_time_out_handler(void *pv) * Return: None */ void csr_roam_roaming_offload_timer_action( - tpAniSirGlobal mac_ctx, uint32_t interval, uint8_t session_id, + struct mac_context *mac_ctx, uint32_t interval, uint8_t session_id, uint8_t action) { struct csr_roam_session *csr_session = CSR_GET_SESSION(mac_ctx, @@ -12346,7 +12346,7 @@ void csr_roam_roaming_offload_timer_action( #endif static QDF_STATUS csr_roam_start_wait_for_key_timer( - tpAniSirGlobal mac, uint32_t interval) + struct mac_context *mac, uint32_t interval) { QDF_STATUS status; uint8_t session_id = mac->roam.WaitForKeyTimerInfo.session_id; @@ -12369,7 +12369,7 @@ static QDF_STATUS csr_roam_start_wait_for_key_timer( return status; } -QDF_STATUS csr_roam_stop_wait_for_key_timer(tpAniSirGlobal mac) +QDF_STATUS csr_roam_stop_wait_for_key_timer(struct mac_context *mac) { uint8_t session_id = mac->roam.WaitForKeyTimerInfo.session_id; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = @@ -12398,7 +12398,7 @@ QDF_STATUS csr_roam_stop_wait_for_key_timer(tpAniSirGlobal mac) return qdf_mc_timer_stop(&mac->roam.hTimerWaitForKey); } -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) { @@ -12436,7 +12436,7 @@ void csr_roam_completion(tpAniSirGlobal mac, uint32_t sessionId, } static -QDF_STATUS csr_roam_lost_link(tpAniSirGlobal mac, uint32_t sessionId, +QDF_STATUS csr_roam_lost_link(struct mac_context *mac, uint32_t sessionId, uint32_t type, tSirSmeRsp *pSirMsg) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -12515,7 +12515,7 @@ QDF_STATUS csr_roam_lost_link(tpAniSirGlobal mac, uint32_t sessionId, } -void csr_roam_wm_status_change_complete(tpAniSirGlobal mac, +void csr_roam_wm_status_change_complete(struct mac_context *mac, uint8_t session_id) { tListElem *pEntry; @@ -12542,7 +12542,7 @@ void csr_roam_wm_status_change_complete(tpAniSirGlobal mac, } void csr_roam_process_wm_status_change_command( - tpAniSirGlobal mac, tSmeCmd *pCommand) + struct mac_context *mac, tSmeCmd *pCommand) { QDF_STATUS status = QDF_STATUS_E_FAILURE; tSirSmeRsp *pSirSmeMsg; @@ -12589,7 +12589,7 @@ end: } } -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) { struct del_sta_self_params *del_sta_self_req; @@ -12636,7 +12636,7 @@ QDF_STATUS csr_process_del_sta_session_command(tpAniSirGlobal mac_ctx, * Return: void */ static void -csr_compute_mode_and_band(tpAniSirGlobal mac_ctx, +csr_compute_mode_and_band(struct mac_context *mac_ctx, enum csr_cfgdot11mode *dot11_mode, enum band_info *band, uint8_t opr_ch) @@ -12794,7 +12794,7 @@ csr_compute_mode_and_band(tpAniSirGlobal mac_ctx, * Return: dot11mode */ static enum csr_cfgdot11mode -csr_roam_get_phy_mode_band_for_bss(tpAniSirGlobal mac_ctx, +csr_roam_get_phy_mode_band_for_bss(struct mac_context *mac_ctx, struct csr_roam_profile *profile, uint8_t opr_chn, enum band_info *p_band) @@ -12865,7 +12865,7 @@ enum csr_cfgdot11mode curr_mode = mac_ctx->roam.configParam.uCfgDot11Mode; return cfg_dot11_mode; } -QDF_STATUS csr_roam_issue_stop_bss(tpAniSirGlobal mac, +QDF_STATUS csr_roam_issue_stop_bss(struct mac_context *mac, uint32_t sessionId, enum csr_roam_substate NewSubstate) { QDF_STATUS status; @@ -12901,7 +12901,7 @@ QDF_STATUS csr_roam_issue_stop_bss(tpAniSirGlobal mac, } /* 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) { uint8_t num_chan_temp = 0; @@ -12923,7 +12923,7 @@ QDF_STATUS csr_get_cfg_valid_channels(tpAniSirGlobal mac, uint8_t *pChannels, return QDF_STATUS_SUCCESS; } -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) { uint32_t cfgLength = 0; int8_t maxTxPwr = 0; @@ -12973,7 +12973,7 @@ error: return maxTxPwr; } -bool csr_roam_is_channel_valid(tpAniSirGlobal mac, uint8_t channel) +bool csr_roam_is_channel_valid(struct mac_context *mac, uint8_t channel) { bool fValid = false; uint32_t idxValidChannels; @@ -12995,7 +12995,7 @@ bool csr_roam_is_channel_valid(tpAniSirGlobal mac, uint8_t channel) } /* This function check and validate whether the NIC can do CB (40MHz) */ -static ePhyChanBondState csr_get_cb_mode_from_ies(tpAniSirGlobal mac, +static ePhyChanBondState csr_get_cb_mode_from_ies(struct mac_context *mac, uint8_t chan, tDot11fBeaconIEs *pIes) { @@ -13082,7 +13082,7 @@ static ePhyChanBondState csr_get_cb_mode_from_ies(tpAniSirGlobal mac, return eRet; } -static bool csr_is_encryption_in_list(tpAniSirGlobal mac, +static bool csr_is_encryption_in_list(struct mac_context *mac, tCsrEncryptionList *pCipherList, eCsrEncryptionType encryptionType) { @@ -13098,7 +13098,7 @@ static bool csr_is_encryption_in_list(tpAniSirGlobal mac, return fFound; } -static bool csr_is_auth_in_list(tpAniSirGlobal mac, tCsrAuthList *pAuthList, +static bool csr_is_auth_in_list(struct mac_context *mac, tCsrAuthList *pAuthList, eCsrAuthType authType) { bool fFound = false; @@ -13113,7 +13113,7 @@ static bool csr_is_auth_in_list(tpAniSirGlobal mac, tCsrAuthList *pAuthList, return fFound; } -bool csr_is_same_profile(tpAniSirGlobal mac, +bool csr_is_same_profile(struct mac_context *mac, tCsrRoamConnectedProfile *pProfile1, struct csr_roam_profile *pProfile2) { @@ -13169,7 +13169,7 @@ free_scan_filter: return fCheck; } -static bool csr_roam_is_same_profile_keys(tpAniSirGlobal mac, +static bool csr_roam_is_same_profile_keys(struct mac_context *mac, tCsrRoamConnectedProfile *pConnProfile, struct csr_roam_profile *pProfile2) { @@ -13212,7 +13212,7 @@ static bool csr_roam_is_same_profile_keys(tpAniSirGlobal mac, /* IBSS */ -static uint8_t csr_roam_get_ibss_start_channel_number50(tpAniSirGlobal mac) +static uint8_t csr_roam_get_ibss_start_channel_number50(struct mac_context *mac) { uint8_t channel = 0; uint32_t idx; @@ -13271,7 +13271,7 @@ static uint8_t csr_roam_get_ibss_start_channel_number50(tpAniSirGlobal mac) return channel; } -static uint8_t csr_roam_get_ibss_start_channel_number24(tpAniSirGlobal mac) +static uint8_t csr_roam_get_ibss_start_channel_number24(struct mac_context *mac) { uint8_t channel = 1; uint32_t idx; @@ -13461,7 +13461,7 @@ static void csr_populate_supported_rates_from_hostapd(tSirMacRateSet *opr_rates, * Return: void */ static QDF_STATUS -csr_roam_get_bss_start_parms(tpAniSirGlobal mac, +csr_roam_get_bss_start_parms(struct mac_context *mac, struct csr_roam_profile *pProfile, struct csr_roamstart_bssparams *pParam, bool skip_hostapd_rate) @@ -13580,7 +13580,7 @@ csr_roam_get_bss_start_parms(tpAniSirGlobal mac, static void csr_roam_get_bss_start_parms_from_bss_desc( - tpAniSirGlobal mac, + struct mac_context *mac, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes, struct csr_roamstart_bssparams *pParam) @@ -13638,7 +13638,7 @@ csr_roam_get_bss_start_parms_from_bss_desc( pIes); } -static void csr_roam_determine_max_rate_for_ad_hoc(tpAniSirGlobal mac, +static void csr_roam_determine_max_rate_for_ad_hoc(struct mac_context *mac, tSirMacRateSet *pSirRateSet) { uint8_t MaxRate = 0; @@ -13657,7 +13657,7 @@ static void csr_roam_determine_max_rate_for_ad_hoc(tpAniSirGlobal mac, } -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, @@ -13771,7 +13771,7 @@ QDF_STATUS csr_roam_issue_start_bss(tpAniSirGlobal mac, uint32_t sessionId, return status; } -void csr_roam_prepare_bss_params(tpAniSirGlobal mac, uint32_t sessionId, +void csr_roam_prepare_bss_params(struct mac_context *mac, uint32_t sessionId, struct csr_roam_profile *pProfile, tSirBssDescription *pBssDesc, struct bss_config_param *pBssConfig, @@ -13841,7 +13841,7 @@ void csr_roam_prepare_bss_params(tpAniSirGlobal mac, uint32_t sessionId, } } -static QDF_STATUS csr_roam_start_ibss(tpAniSirGlobal mac, uint32_t sessionId, +static QDF_STATUS csr_roam_start_ibss(struct mac_context *mac, uint32_t sessionId, struct csr_roam_profile *pProfile, bool *pfSameIbss) { @@ -13907,7 +13907,7 @@ static QDF_STATUS csr_roam_start_ibss(tpAniSirGlobal mac, uint32_t sessionId, return status; } -static void csr_roam_update_connected_profile_from_new_bss(tpAniSirGlobal mac, +static void csr_roam_update_connected_profile_from_new_bss(struct mac_context *mac, uint32_t sessionId, tSirSmeNewBssInfo *pNewBss) { @@ -13931,7 +13931,7 @@ static void csr_roam_update_connected_profile_from_new_bss(tpAniSirGlobal mac, } #ifdef WLAN_FEATURE_ROAM_OFFLOAD -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) { struct csr_roam_session *session = NULL; @@ -13950,7 +13950,7 @@ void csr_get_pmk_info(tpAniSirGlobal mac_ctx, uint8_t session_id, pmk_cache->pmk_len = session->pmk_len; } -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) { struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId); @@ -14053,7 +14053,7 @@ static void csr_update_pmk_cache(struct csr_roam_session *session, } QDF_STATUS -csr_roam_set_pmkid_cache(tpAniSirGlobal mac, uint32_t sessionId, +csr_roam_set_pmkid_cache(struct mac_context *mac, uint32_t sessionId, tPmkidCacheInfo *pPMKIDCache, uint32_t numItems, bool update_entire_cache) { @@ -14098,7 +14098,7 @@ csr_roam_set_pmkid_cache(tpAniSirGlobal mac, uint32_t sessionId, return QDF_STATUS_SUCCESS; } -QDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal mac, +QDF_STATUS csr_roam_del_pmkid_from_cache(struct mac_context *mac, uint32_t sessionId, tPmkidCacheInfo *pmksa, bool flush_cache) @@ -14191,12 +14191,12 @@ QDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal mac, return QDF_STATUS_SUCCESS; } -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) { return mac->roam.roamSession[sessionId].NumPmkidCache; } -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) { struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId); @@ -14243,7 +14243,7 @@ QDF_STATUS csr_roam_get_pmkid_cache(tpAniSirGlobal mac, uint32_t sessionId, return QDF_STATUS_SUCCESS; } -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) { QDF_STATUS status = QDF_STATUS_E_INVAL; @@ -14269,7 +14269,7 @@ QDF_STATUS csr_roam_get_wpa_rsn_req_ie(tpAniSirGlobal mac, uint32_t sessionId, return status; } -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) { QDF_STATUS status = QDF_STATUS_E_INVAL; @@ -14296,7 +14296,7 @@ QDF_STATUS csr_roam_get_wpa_rsn_rsp_ie(tpAniSirGlobal mac, uint32_t sessionId, } #ifdef FEATURE_WLAN_WAPI -QDF_STATUS csr_roam_get_wapi_req_ie(tpAniSirGlobal mac, uint32_t sessionId, +QDF_STATUS csr_roam_get_wapi_req_ie(struct mac_context *mac, uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf) { QDF_STATUS status = QDF_STATUS_E_INVAL; @@ -14322,7 +14322,7 @@ QDF_STATUS csr_roam_get_wapi_req_ie(tpAniSirGlobal mac, uint32_t sessionId, return status; } -QDF_STATUS csr_roam_get_wapi_rsp_ie(tpAniSirGlobal mac, uint32_t sessionId, +QDF_STATUS csr_roam_get_wapi_rsp_ie(struct mac_context *mac, uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf) { QDF_STATUS status = QDF_STATUS_E_INVAL; @@ -14348,7 +14348,7 @@ QDF_STATUS csr_roam_get_wapi_rsp_ie(tpAniSirGlobal mac, uint32_t sessionId, return status; } #endif /* FEATURE_WLAN_WAPI */ -eRoamCmdStatus csr_get_roam_complete_status(tpAniSirGlobal mac, +eRoamCmdStatus csr_get_roam_complete_status(struct mac_context *mac, uint32_t sessionId) { eRoamCmdStatus retStatus = eCSR_ROAM_CONNECT_COMPLETION; @@ -14366,7 +14366,7 @@ eRoamCmdStatus csr_get_roam_complete_status(tpAniSirGlobal mac, return retStatus; } -static QDF_STATUS csr_roam_start_wds(tpAniSirGlobal mac, uint32_t sessionId, +static QDF_STATUS csr_roam_start_wds(struct mac_context *mac, uint32_t sessionId, struct csr_roam_profile *pProfile, tSirBssDescription *pBssDesc) { @@ -14450,7 +14450,7 @@ static QDF_STATUS csr_roam_start_wds(tpAniSirGlobal mac, uint32_t sessionId, * * Return: void */ -static void csr_add_supported_5Ghz_channels(tpAniSirGlobal mac_ctx, +static void csr_add_supported_5Ghz_channels(struct mac_context *mac_ctx, uint8_t *chan_list, uint8_t *num_chnl, bool supp_chan_ie) @@ -14501,7 +14501,7 @@ static void csr_add_supported_5Ghz_channels(tpAniSirGlobal mac_ctx, * * Return: QDF_STATUS */ -static QDF_STATUS csr_set_ldpc_exception(tpAniSirGlobal mac_ctx, +static QDF_STATUS csr_set_ldpc_exception(struct mac_context *mac_ctx, struct csr_roam_session *session, uint8_t channel, bool usr_cfg_rx_ldpc) { @@ -14620,7 +14620,7 @@ static void csr_update_fils_connection_info(struct csr_roam_profile *profile, * Return: None */ static void csr_update_sae_config(tSirSmeJoinReq *csr_join_req, - tpAniSirGlobal mac, struct csr_roam_session *session) + struct mac_context *mac, struct csr_roam_session *session) { tPmkidCacheInfo pmkid_cache; uint32_t index; @@ -14637,7 +14637,7 @@ static void csr_update_sae_config(tSirSmeJoinReq *csr_join_req, } #else static void csr_update_sae_config(tSirSmeJoinReq *csr_join_req, - tpAniSirGlobal mac, struct csr_roam_session *session) + struct mac_context *mac, struct csr_roam_session *session) { } #endif @@ -14732,7 +14732,7 @@ void csr_dump_vendor_ies(uint8_t *ie, uint16_t ie_len) * Return: true or false */ static bool -csr_check_vendor_ap_3_present(tpAniSirGlobal mac_ctx, uint8_t *ie, +csr_check_vendor_ap_3_present(struct mac_context *mac_ctx, uint8_t *ie, uint16_t ie_len) { bool ret = true; @@ -14776,7 +14776,7 @@ static bool csr_enable_twt(tDot11fBeaconIEs *ie) * * Return: true or flase */ -static bool csr_enable_uapsd(tpAniSirGlobal mac_ctx, tDot11fBeaconIEs *ie) +static bool csr_enable_uapsd(struct mac_context *mac_ctx, tDot11fBeaconIEs *ie) { /* In non-HE case, TWT is enabled only for Q2Q. * So keed uAPSD enabled for non-Q2Q in this non-HE case. @@ -14810,7 +14810,7 @@ static bool csr_enable_uapsd(tpAniSirGlobal mac_ctx, tDot11fBeaconIEs *ie) * the size of actual 'tSirBssDescription' varies, the receiving side should * keep in mind not to access the components DIRECTLY after tSirRSNie. */ -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) @@ -15728,7 +15728,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal mac, uint32_t sessionId, } /* */ -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) { tSirSmeDisassocReq *pMsg; @@ -15782,7 +15782,7 @@ QDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal mac, uint32_t sessionId, } QDF_STATUS -csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal mac, uint32_t sessionId, +csr_send_mb_get_associated_stas_req_msg(struct mac_context *mac, uint32_t sessionId, QDF_MODULE_ID modId, struct qdf_mac_addr bssid, void *pUsrContext, @@ -15809,7 +15809,7 @@ csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal mac, uint32_t sessionId, return status; } -QDF_STATUS csr_send_chng_mcc_beacon_interval(tpAniSirGlobal mac, +QDF_STATUS csr_send_chng_mcc_beacon_interval(struct mac_context *mac, uint32_t sessionId) { tpSirChangeBIParams pMsg; @@ -15858,7 +15858,7 @@ QDF_STATUS csr_send_chng_mcc_beacon_interval(tpAniSirGlobal mac, } #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) { tpSirSetHT2040Mode pMsg; @@ -15898,7 +15898,7 @@ QDF_STATUS csr_set_ht2040_mode(tpAniSirGlobal mac, uint32_t sessionId, } #endif -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) { tSirSmeDeauthReq *pMsg; @@ -15938,7 +15938,7 @@ QDF_STATUS csr_send_mb_deauth_req_msg(tpAniSirGlobal mac, uint32_t sessionId, return umac_send_mb_message_to_mac(pMsg); } -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 status = QDF_STATUS_SUCCESS; @@ -15976,7 +15976,7 @@ QDF_STATUS csr_send_mb_disassoc_cnf_msg(tpAniSirGlobal mac, return status; } -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 status = QDF_STATUS_SUCCESS; @@ -16012,7 +16012,7 @@ QDF_STATUS csr_send_mb_deauth_cnf_msg(tpAniSirGlobal mac, return status; } -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 Halstatus) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -16054,7 +16054,7 @@ QDF_STATUS csr_send_assoc_cnf_msg(tpAniSirGlobal mac, tpSirSmeAssocInd return 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) @@ -16181,7 +16181,7 @@ QDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal mac, return QDF_STATUS_SUCCESS; } -QDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal mac, +QDF_STATUS csr_send_mb_set_context_req_msg(struct mac_context *mac, uint32_t sessionId, struct qdf_mac_addr peer_macaddr, uint8_t numKeys, @@ -16256,7 +16256,7 @@ QDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal mac, return status; } -QDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal mac, uint32_t +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) @@ -16399,7 +16399,7 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal mac, uint32_t return umac_send_mb_message_to_mac(pMsg); } -QDF_STATUS csr_send_mb_stop_bss_req_msg(tpAniSirGlobal mac, uint32_t sessionId) +QDF_STATUS csr_send_mb_stop_bss_req_msg(struct mac_context *mac, uint32_t sessionId) { tSirSmeStopBssReq *pMsg; struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId); @@ -16421,7 +16421,7 @@ QDF_STATUS csr_send_mb_stop_bss_req_msg(tpAniSirGlobal mac, uint32_t sessionId) return umac_send_mb_message_to_mac(pMsg); } -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) { @@ -16447,7 +16447,7 @@ QDF_STATUS csr_reassoc(tpAniSirGlobal mac, uint32_t sessionId, return status; } -static QDF_STATUS csr_roam_session_opened(tpAniSirGlobal mac, +static QDF_STATUS csr_roam_session_opened(struct mac_context *mac, QDF_STATUS qdf_status, uint32_t sessionId) { @@ -16468,7 +16468,7 @@ static QDF_STATUS csr_roam_session_opened(tpAniSirGlobal mac, return status; } -QDF_STATUS csr_process_add_sta_session_rsp(tpAniSirGlobal mac, uint8_t *pMsg) +QDF_STATUS csr_process_add_sta_session_rsp(struct mac_context *mac, uint8_t *pMsg) { struct add_sta_self_params *rsp; struct send_extcap_ie *msg; @@ -16518,7 +16518,7 @@ QDF_STATUS csr_process_add_sta_session_rsp(tpAniSirGlobal mac, uint8_t *pMsg) * * Return: None */ -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) { @@ -16562,7 +16562,7 @@ void csr_get_vdev_type_nss(tpAniSirGlobal mac_ctx, } static -QDF_STATUS csr_issue_add_sta_for_session_req(tpAniSirGlobal mac, +QDF_STATUS csr_issue_add_sta_for_session_req(struct mac_context *mac, uint32_t sessionId, tSirMacAddr sessionMacAddr, uint32_t type, uint32_t subType) @@ -16651,7 +16651,7 @@ QDF_STATUS csr_issue_add_sta_for_session_req(tpAniSirGlobal mac, return status; } -QDF_STATUS csr_roam_open_session(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_roam_open_session(struct mac_context *mac_ctx, struct sme_session_params *session_param) { QDF_STATUS status; @@ -16772,7 +16772,7 @@ QDF_STATUS csr_roam_open_session(tpAniSirGlobal mac_ctx, session_param->subtype_of_persona); } -QDF_STATUS csr_process_del_sta_session_rsp(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_process_del_sta_session_rsp(struct mac_context *mac_ctx, uint8_t *pMsg) { QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -16835,7 +16835,7 @@ QDF_STATUS csr_process_del_sta_session_rsp(tpAniSirGlobal mac_ctx, static QDF_STATUS -csr_issue_del_sta_for_session_req(tpAniSirGlobal mac_ctx, uint32_t session_id, +csr_issue_del_sta_for_session_req(struct mac_context *mac_ctx, uint32_t session_id, tSirMacAddr session_mac_addr, csr_session_close_cb callback, void *context) @@ -16860,7 +16860,7 @@ csr_issue_del_sta_for_session_req(tpAniSirGlobal mac_ctx, uint32_t session_id, return status; } -void csr_cleanup_session(tpAniSirGlobal mac, uint32_t sessionId) +void csr_cleanup_session(struct mac_context *mac, uint32_t sessionId) { if (CSR_IS_SESSION_VALID(mac, sessionId)) { struct csr_roam_session *pSession = CSR_GET_SESSION(mac, @@ -16883,7 +16883,7 @@ void csr_cleanup_session(tpAniSirGlobal mac, uint32_t sessionId) } } -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) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -16924,7 +16924,7 @@ QDF_STATUS csr_roam_close_session(tpAniSirGlobal mac_ctx, return status; } -static void csr_init_session(tpAniSirGlobal mac, uint32_t sessionId) +static void csr_init_session(struct mac_context *mac, uint32_t sessionId) { struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId); @@ -16978,7 +16978,7 @@ static void csr_init_session(tpAniSirGlobal mac, uint32_t sessionId) pSession->nAddIEAssocLength = 0; } -QDF_STATUS csr_roam_get_session_id_from_bssid(tpAniSirGlobal mac, +QDF_STATUS csr_roam_get_session_id_from_bssid(struct mac_context *mac, struct qdf_mac_addr *bssid, uint32_t *pSessionId) { @@ -17004,7 +17004,7 @@ QDF_STATUS csr_roam_get_session_id_from_bssid(tpAniSirGlobal mac, * We cannot use BSSID to identify session because for IBSS, * the bssid changes. */ -static uint32_t csr_find_ibss_session(tpAniSirGlobal mac) +static uint32_t csr_find_ibss_session(struct mac_context *mac) { uint32_t i, nRet = CSR_SESSION_ID_INVALID; struct csr_roam_session *pSession; @@ -17025,7 +17025,7 @@ static uint32_t csr_find_ibss_session(tpAniSirGlobal mac) return nRet; } -static void csr_roam_link_up(tpAniSirGlobal mac, struct qdf_mac_addr bssid) +static void csr_roam_link_up(struct mac_context *mac, struct qdf_mac_addr bssid) { uint32_t sessionId = 0; @@ -17043,7 +17043,7 @@ static void csr_roam_link_up(tpAniSirGlobal mac, struct qdf_mac_addr bssid) QDF_STATUS_SUCCESS); } -static void csr_roam_link_down(tpAniSirGlobal mac, uint32_t sessionId) +static void csr_roam_link_down(struct mac_context *mac, uint32_t sessionId) { struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId); @@ -17087,7 +17087,7 @@ static void csr_roam_link_down(tpAniSirGlobal mac, uint32_t sessionId) } #ifndef QCA_SUPPORT_CP_STATS -QDF_STATUS csr_send_mb_stats_req_msg(tpAniSirGlobal mac, uint32_t statsMask, +QDF_STATUS csr_send_mb_stats_req_msg(struct mac_context *mac, uint32_t statsMask, uint8_t staId, uint8_t sessionId) { tAniGetPEStatsReq *pMsg; @@ -17124,7 +17124,7 @@ QDF_STATUS csr_send_mb_stats_req_msg(tpAniSirGlobal mac, uint32_t statsMask, * Return: void */ static void -csr_update_stats(tpAniSirGlobal mac, uint8_t stats_type, +csr_update_stats(struct mac_context *mac, uint8_t stats_type, tAniGetPEStatsRsp *sme_stats_rsp, uint8_t **stats, uint32_t *length) { @@ -17163,7 +17163,7 @@ csr_update_stats(tpAniSirGlobal mac, uint8_t stats_type, * * Return: void */ -void csr_roam_stats_rsp_processor(tpAniSirGlobal mac, tSirSmeRsp *pSirMsg) +void csr_roam_stats_rsp_processor(struct mac_context *mac, tSirSmeRsp *pSirMsg) { tAniGetPEStatsRsp *pSmeStatsRsp; tListElem *pEntry = NULL; @@ -17252,7 +17252,7 @@ post_update: } tListElem *csr_roam_find_in_pe_stats_req_list( - tpAniSirGlobal mac, uint32_t statsMask) + struct mac_context *mac, uint32_t statsMask) { tListElem *pEntry = NULL; struct csr_pestats_reqinfo *pTempStaEntry = NULL; @@ -17275,7 +17275,7 @@ tListElem *csr_roam_find_in_pe_stats_req_list( static tListElem *csr_roam_checkn_update_client_req_list( -tpAniSirGlobal mac, struct csr_statsclient_reqinfo *pStaEntry, +struct mac_context *mac, struct csr_statsclient_reqinfo *pStaEntry, bool update) { tListElem *pEntry; @@ -17307,7 +17307,7 @@ tpAniSirGlobal mac, struct csr_statsclient_reqinfo *pStaEntry, return pEntry; } -tListElem *csr_roam_check_client_req_list(tpAniSirGlobal mac, +tListElem *csr_roam_check_client_req_list(struct mac_context *mac, uint32_t statsMask) { tListElem *pEntry; @@ -17336,7 +17336,7 @@ tListElem *csr_roam_check_client_req_list(tpAniSirGlobal mac, } struct csr_statsclient_reqinfo *csr_roam_insert_entry_into_list( - tpAniSirGlobal mac, tDblLinkList *pStaList, + struct mac_context *mac, tDblLinkList *pStaList, struct csr_statsclient_reqinfo * pStaEntry) { @@ -17368,7 +17368,7 @@ struct csr_statsclient_reqinfo *csr_roam_insert_entry_into_list( } #endif /* QCA_SUPPORT_CP_STATS */ -QDF_STATUS csr_get_rssi(tpAniSirGlobal mac, +QDF_STATUS csr_get_rssi(struct mac_context *mac, tCsrRssiCallback callback, uint8_t staId, struct qdf_mac_addr bssId, @@ -17416,7 +17416,7 @@ QDF_STATUS csr_get_rssi(tpAniSirGlobal mac, return status; } -QDF_STATUS csr_get_snr(tpAniSirGlobal mac, +QDF_STATUS csr_get_snr(struct mac_context *mac, tCsrSnrCallback callback, uint8_t staId, struct qdf_mac_addr bssId, void *pContext) { @@ -17467,7 +17467,7 @@ QDF_STATUS csr_get_snr(tpAniSirGlobal mac, * Return: status of operation */ static QDF_STATUS -csr_deregister_client_request(tpAniSirGlobal mac_ctx, +csr_deregister_client_request(struct mac_context *mac_ctx, struct csr_statsclient_reqinfo *sta_entry) { QDF_STATUS status; @@ -17511,7 +17511,7 @@ csr_deregister_client_request(tpAniSirGlobal mac_ctx, * Return: status of operation */ static QDF_STATUS -csr_insert_stats_request_to_list(tpAniSirGlobal mac_ctx, +csr_insert_stats_request_to_list(struct mac_context *mac_ctx, struct csr_statsclient_reqinfo *sta_entry) { struct csr_statsclient_reqinfo *ptr_sta_entry = csr_roam_insert_entry_into_list( @@ -17524,7 +17524,7 @@ struct csr_statsclient_reqinfo *ptr_sta_entry = csr_roam_insert_entry_into_list( return QDF_STATUS_SUCCESS; } -QDF_STATUS csr_get_statistics(tpAniSirGlobal mac, +QDF_STATUS csr_get_statistics(struct mac_context *mac, eCsrStatsRequesterType requesterId, uint32_t statsMask, tCsrStatsCallback callback, @@ -17605,7 +17605,7 @@ QDF_STATUS csr_get_statistics(tpAniSirGlobal mac, * Other status means CSR is failed to update. */ -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) @@ -17666,7 +17666,7 @@ void csr_update_roam_scan_ese_params(tSirRoamOffloadScanReq *req_buf, * Return: void */ static void -csr_update_roam_scan_offload_request(tpAniSirGlobal mac_ctx, +csr_update_roam_scan_offload_request(struct mac_context *mac_ctx, tSirRoamOffloadScanReq *req_buf, struct csr_roam_session *session) { @@ -17736,7 +17736,7 @@ csr_check_band_channel_match(enum band_info band, uint8_t channel) * Return: result of operation */ static QDF_STATUS -csr_fetch_ch_lst_from_ini(tpAniSirGlobal mac_ctx, +csr_fetch_ch_lst_from_ini(struct mac_context *mac_ctx, tpCsrNeighborRoamControlInfo roam_info, tSirRoamOffloadScanReq *req_buf) { @@ -17829,7 +17829,7 @@ csr_fetch_ch_lst_from_ini(tpAniSirGlobal mac_ctx, * Return: void */ static void -csr_fetch_ch_lst_from_occupied_lst(tpAniSirGlobal mac_ctx, +csr_fetch_ch_lst_from_occupied_lst(struct mac_context *mac_ctx, uint8_t session_id, uint8_t reason, tSirRoamOffloadScanReq *req_buf, @@ -17914,7 +17914,7 @@ csr_fetch_ch_lst_from_occupied_lst(tpAniSirGlobal mac_ctx, * Return: void */ static QDF_STATUS -csr_fetch_valid_ch_lst(tpAniSirGlobal mac_ctx, +csr_fetch_valid_ch_lst(struct mac_context *mac_ctx, tSirRoamOffloadScanReq *req_buf, uint8_t session_id) { @@ -18023,7 +18023,7 @@ csr_fetch_valid_ch_lst(tpAniSirGlobal mac_ctx, * Return: roam offload scan request packet buffer */ static tSirRoamOffloadScanReq * -csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, +csr_create_roam_scan_offload_request(struct mac_context *mac_ctx, uint8_t command, uint8_t session_id, uint8_t reason, @@ -18309,7 +18309,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, * * Return: none */ -static void csr_update_11k_offload_params(tpAniSirGlobal mac_ctx, +static void csr_update_11k_offload_params(struct mac_context *mac_ctx, struct csr_roam_session *session, tSirRoamOffloadScanReq *req_buffer, bool enabled) @@ -18503,7 +18503,7 @@ static void check_allowed_ssid_list(tSirRoamOffloadScanReq *req_buffer, * * Return: None */ -static void csr_add_rssi_reject_ap_list(tpAniSirGlobal mac_ctx, +static void csr_add_rssi_reject_ap_list(struct mac_context *mac_ctx, struct roam_ext_params *roam_params) { int i = 0; @@ -18587,7 +18587,7 @@ static void csr_add_rssi_reject_ap_list(tpAniSirGlobal mac_ctx, #define RSO_ABORT_SCAN_ALLOW_MASK (RSO_START_BIT | RSO_RESTART_BIT | \ RSO_UPDATE_CFG_BIT | RSO_ABORT_SCAN_BIT) -static bool csr_is_RSO_cmd_allowed(tpAniSirGlobal mac_ctx, +static bool csr_is_RSO_cmd_allowed(struct mac_context *mac_ctx, uint8_t command, uint8_t session_id) { tpCsrNeighborRoamControlInfo neigh_roam_info = @@ -18628,7 +18628,7 @@ static bool csr_is_RSO_cmd_allowed(tpAniSirGlobal mac_ctx, * * Return: QDF_STATUS */ -static QDF_STATUS csr_roam_send_rso_cmd(tpAniSirGlobal mac_ctx, +static QDF_STATUS csr_roam_send_rso_cmd(struct mac_context *mac_ctx, uint8_t session_id, tSirRoamOffloadScanReq *request_buf) { @@ -18655,7 +18655,7 @@ static QDF_STATUS csr_roam_send_rso_cmd(tpAniSirGlobal mac_ctx, * * Return: None */ -static void csr_append_assoc_ies(tpAniSirGlobal mac_ctx, +static void csr_append_assoc_ies(struct mac_context *mac_ctx, tSirRoamOffloadScanReq *req_buf, uint8_t ie_id, uint8_t ie_len, uint8_t *ie_data) { @@ -18684,7 +18684,7 @@ static void csr_append_assoc_ies(tpAniSirGlobal mac_ctx, * * Return: None */ -static void ese_populate_addtional_ies(tpAniSirGlobal mac_ctx, +static void ese_populate_addtional_ies(struct mac_context *mac_ctx, struct csr_roam_session *session, tSirRoamOffloadScanReq *req_buf) { @@ -18717,7 +18717,7 @@ static void ese_populate_addtional_ies(tpAniSirGlobal mac_ctx, } #else static inline void ese_populate_addtional_ies( - tpAniSirGlobal mac_ctx, + struct mac_context *mac_ctx, struct csr_roam_session *session, tSirRoamOffloadScanReq *req_buf) { } #endif @@ -18729,7 +18729,7 @@ static inline void ese_populate_addtional_ies( * * Return: None */ -static void csr_update_driver_assoc_ies(tpAniSirGlobal mac_ctx, +static void csr_update_driver_assoc_ies(struct mac_context *mac_ctx, struct csr_roam_session *session, tSirRoamOffloadScanReq *req_buf) { @@ -18819,7 +18819,7 @@ static void csr_update_driver_assoc_ies(tpAniSirGlobal mac_ctx, * Return: per roam config request packet buffer */ static struct wmi_per_roam_config_req * -csr_create_per_roam_request(tpAniSirGlobal mac_ctx, +csr_create_per_roam_request(struct mac_context *mac_ctx, uint8_t session_id) { struct wmi_per_roam_config_req *req_buf = NULL; @@ -18875,7 +18875,7 @@ csr_create_per_roam_request(tpAniSirGlobal mac_ctx, * Return: result of operation */ static QDF_STATUS -csr_roam_offload_per_scan(tpAniSirGlobal mac_ctx, uint8_t session_id) +csr_roam_offload_per_scan(struct mac_context *mac_ctx, uint8_t session_id) { tpCsrNeighborRoamControlInfo roam_info = &mac_ctx->roam.neighborRoamInfo[session_id]; @@ -18917,7 +18917,7 @@ csr_roam_offload_per_scan(tpAniSirGlobal mac_ctx, uint8_t session_id) } #if defined(WLAN_FEATURE_FILS_SK) -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) { struct csr_roam_session *session = CSR_GET_SESSION(mac, session_id); @@ -18973,7 +18973,7 @@ static uint32_t copy_all_before_char(char *str, uint32_t str_len, * * Return: None */ -static void csr_update_fils_params_rso(tpAniSirGlobal mac, +static void csr_update_fils_params_rso(struct mac_context *mac, struct csr_roam_session *session, tSirRoamOffloadScanReq *req_buffer) { @@ -19030,7 +19030,7 @@ static void csr_update_fils_params_rso(tpAniSirGlobal mac, roam_fils_params->realm_len); } #else -static inline void csr_update_fils_params_rso(tpAniSirGlobal mac, +static inline void csr_update_fils_params_rso(struct mac_context *mac, struct csr_roam_session *session, tSirRoamOffloadScanReq *req_buffer) {} @@ -19043,7 +19043,7 @@ static inline void csr_update_fils_params_rso(tpAniSirGlobal mac, * * Return: None */ -static void csr_update_score_params(tpAniSirGlobal mac_ctx, +static void csr_update_score_params(struct mac_context *mac_ctx, tSirRoamOffloadScanReq *req_buffer) { struct scoring_param *req_score_params; @@ -19118,7 +19118,7 @@ static void csr_update_score_params(tpAniSirGlobal mac_ctx, bss_score_params->oce_wan_scoring.score_pcnt15_to_12; } -uint8_t csr_get_roam_enabled_sta_sessionid(tpAniSirGlobal mac_ctx) +uint8_t csr_get_roam_enabled_sta_sessionid(struct mac_context *mac_ctx) { struct csr_roam_session *session; tpCsrNeighborRoamControlInfo roam_info; @@ -19154,7 +19154,7 @@ uint8_t csr_get_roam_enabled_sta_sessionid(tpAniSirGlobal mac_ctx) * Return: result of operation */ QDF_STATUS -csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, +csr_roam_offload_scan(struct mac_context *mac_ctx, uint8_t session_id, uint8_t command, uint8_t reason) { uint8_t *state = NULL; @@ -19470,7 +19470,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, return status; } -QDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal mac, +QDF_STATUS csr_roam_offload_scan_rsp_hdlr(struct mac_context *mac, tpSirRoamOffloadScanRsp scanOffloadRsp) { @@ -19495,7 +19495,7 @@ QDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal mac, #ifndef QCA_SUPPORT_CP_STATS /* pStaEntry is no longer invalid upon the return of this function. */ -static void csr_roam_remove_stat_list_entry(tpAniSirGlobal mac, +static void csr_roam_remove_stat_list_entry(struct mac_context *mac, tListElem *pEntry) { if (pEntry) { @@ -19507,7 +19507,7 @@ static void csr_roam_remove_stat_list_entry(tpAniSirGlobal mac, } static void csr_roam_remove_entry_from_pe_stats_req_list( -tpAniSirGlobal mac, struct csr_pestats_reqinfo *pPeStaEntry) +struct mac_context *mac, struct csr_pestats_reqinfo *pPeStaEntry) { tListElem *pEntry; struct csr_pestats_reqinfo *pTempStaEntry; @@ -19539,7 +19539,7 @@ tpAniSirGlobal mac, struct csr_pestats_reqinfo *pPeStaEntry) } /* end of while loop */ } -static void csr_roam_report_statistics(tpAniSirGlobal mac, +static void csr_roam_report_statistics(struct mac_context *mac, uint32_t statsMask, tCsrStatsCallback callback, uint8_t staId, void *pContext) @@ -19611,7 +19611,7 @@ static void csr_roam_report_statistics(tpAniSirGlobal mac, } static QDF_STATUS csr_roam_dereg_statistics_req( - tpAniSirGlobal mac) + struct mac_context *mac) { tListElem *pEntry = NULL; tListElem *pPrevEntry = NULL; @@ -19675,7 +19675,7 @@ static QDF_STATUS csr_roam_dereg_statistics_req( } #endif /* QCA_SUPPORT_CP_STATS */ -tSmeCmd *csr_get_command_buffer(tpAniSirGlobal mac) +tSmeCmd *csr_get_command_buffer(struct mac_context *mac) { tSmeCmd *pCmd = sme_get_command_buffer(mac); @@ -19685,7 +19685,7 @@ tSmeCmd *csr_get_command_buffer(tpAniSirGlobal mac) return pCmd; } -static void csr_free_cmd_memory(tpAniSirGlobal mac, tSmeCmd *pCommand) +static void csr_free_cmd_memory(struct mac_context *mac, tSmeCmd *pCommand) { if (!pCommand) { sme_err("pCommand is NULL"); @@ -19703,7 +19703,7 @@ static void csr_free_cmd_memory(tpAniSirGlobal mac, tSmeCmd *pCommand) } } -void csr_release_command_buffer(tpAniSirGlobal mac, tSmeCmd *pCommand) +void csr_release_command_buffer(struct mac_context *mac, tSmeCmd *pCommand) { if (mac->roam.sPendingCommands > 0) { /* @@ -19719,7 +19719,7 @@ void csr_release_command_buffer(tpAniSirGlobal mac, tSmeCmd *pCommand) } } -void csr_release_command(tpAniSirGlobal mac_ctx, tSmeCmd *sme_cmd) +void csr_release_command(struct mac_context *mac_ctx, tSmeCmd *sme_cmd) { struct wlan_serialization_queued_cmd_info cmd_info; struct wlan_serialization_command cmd; @@ -19864,7 +19864,7 @@ enum wlan_serialization_cmd_type csr_get_cmd_type(tSmeCmd *sme_cmd) return cmd_type; } -static uint32_t csr_get_monotonous_number(tpAniSirGlobal mac_ctx) +static uint32_t csr_get_monotonous_number(struct mac_context *mac_ctx) { uint32_t cmd_id; uint32_t mask = 0x00FFFFFF, prefix = 0x0D000000; @@ -19876,7 +19876,7 @@ static uint32_t csr_get_monotonous_number(tpAniSirGlobal mac_ctx) return cmd_id; } -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) { @@ -19933,7 +19933,7 @@ QDF_STATUS csr_set_serialization_params_to_cmd(tpAniSirGlobal mac_ctx, return QDF_STATUS_SUCCESS; } -QDF_STATUS csr_queue_sme_command(tpAniSirGlobal mac_ctx, tSmeCmd *sme_cmd, +QDF_STATUS csr_queue_sme_command(struct mac_context *mac_ctx, tSmeCmd *sme_cmd, bool high_priority) { struct wlan_serialization_command cmd; @@ -19995,7 +19995,7 @@ error: return QDF_STATUS_E_FAILURE; } -QDF_STATUS csr_roam_update_config(tpAniSirGlobal mac_ctx, uint8_t session_id, +QDF_STATUS csr_roam_update_config(struct mac_context *mac_ctx, uint8_t session_id, uint16_t capab, uint32_t value) { struct update_config *msg; @@ -20049,7 +20049,7 @@ static void csr_ser_des_unpack_diassoc_rsp(uint8_t *pBuf, tSirSmeDisassocRsp } /* Returns whether a session is in QDF_STA_MODE...or not */ -bool csr_roam_is_sta_mode(tpAniSirGlobal mac, uint32_t sessionId) +bool csr_roam_is_sta_mode(struct mac_context *mac, uint32_t sessionId) { struct csr_roam_session *pSession = NULL; @@ -20083,7 +20083,7 @@ bool csr_roam_is_sta_mode(tpAniSirGlobal mac, uint32_t sessionId) return false; } -QDF_STATUS csr_handoff_request(tpAniSirGlobal mac, +QDF_STATUS csr_handoff_request(struct mac_context *mac, uint8_t sessionId, tCsrHandoffRequest *pHandoffInfo) { @@ -20127,7 +20127,7 @@ QDF_STATUS csr_handoff_request(tpAniSirGlobal mac, * * Return: QDF_STATUS */ -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) @@ -20192,7 +20192,7 @@ QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal mac, * immediately after SAP CAC WAIT is * completed without any RADAR indications. */ -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) { @@ -20225,7 +20225,7 @@ QDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal mac, * Return: QDF_STATUS - Success or failure */ QDF_STATUS -csr_roam_modify_add_ies(tpAniSirGlobal mac, +csr_roam_modify_add_ies(struct mac_context *mac, tSirModifyIE *pModifyIE, eUpdateIEsType updateType) { tpSirModifyIEsInd pModifyAddIEInd = NULL; @@ -20288,7 +20288,7 @@ csr_roam_modify_add_ies(tpAniSirGlobal mac, * Return: QDF_STATUS - Success or failure */ QDF_STATUS -csr_roam_update_add_ies(tpAniSirGlobal mac, +csr_roam_update_add_ies(struct mac_context *mac, tSirUpdateIE *pUpdateIE, eUpdateIEsType updateType) { tpSirUpdateIEsInd pUpdateAddIEs = NULL; @@ -20344,7 +20344,7 @@ csr_roam_update_add_ies(tpAniSirGlobal mac, * * Return: success if msg posted to LIM else return failure */ -QDF_STATUS csr_send_ext_change_channel(tpAniSirGlobal mac_ctx, uint32_t channel, +QDF_STATUS csr_send_ext_change_channel(struct mac_context *mac_ctx, uint32_t channel, uint8_t session_id) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -20363,7 +20363,7 @@ QDF_STATUS csr_send_ext_change_channel(tpAniSirGlobal mac_ctx, uint32_t channel, } #ifdef CONFIG_VDEV_SM -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) { QDF_STATUS status; struct scheduler_msg message = {0}; @@ -20394,7 +20394,7 @@ QDF_STATUS csr_csa_restart(tpAniSirGlobal mac_ctx, uint8_t session_id) * * Return: success or failure **/ -QDF_STATUS csr_roam_send_chan_sw_ie_request(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_roam_send_chan_sw_ie_request(struct mac_context *mac_ctx, struct qdf_mac_addr bssid, uint8_t target_channel, uint8_t csa_ie_reqd, @@ -20438,7 +20438,7 @@ QDF_STATUS csr_roam_send_chan_sw_ie_request(tpAniSirGlobal mac_ctx, * * Return: None */ -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) { @@ -20479,7 +20479,7 @@ void csr_roaming_report_diag_event(tpAniSirGlobal mac_ctx, * param mac global structure * param pMsgBuf - Contains the session ID for which the handler should apply */ -void csr_process_ho_fail_ind(tpAniSirGlobal mac_ctx, void *pMsgBuf) +void csr_process_ho_fail_ind(struct mac_context *mac_ctx, void *pMsgBuf) { tSirSmeHOFailureInd *pSmeHOFailInd = (tSirSmeHOFailureInd *) pMsgBuf; uint32_t sessionId; @@ -20529,7 +20529,7 @@ void csr_process_ho_fail_ind(tpAniSirGlobal mac_ctx, void *pMsgBuf) * Return: void */ static void -csr_update_op_class_array(tpAniSirGlobal mac_ctx, +csr_update_op_class_array(struct mac_context *mac_ctx, uint8_t *op_classes, struct csr_channel *channel_info, char *ch_name, @@ -20627,7 +20627,7 @@ static void csr_init_operating_classes(struct mac_context *mac) * Return: session id for give session type. **/ static uint32_t -csr_find_session_by_type(tpAniSirGlobal mac_ctx, enum QDF_OPMODE type) +csr_find_session_by_type(struct mac_context *mac_ctx, enum QDF_OPMODE type) { uint32_t i, session_id = CSR_SESSION_ID_INVALID; struct csr_roam_session *session_ptr; @@ -20652,7 +20652,7 @@ csr_find_session_by_type(tpAniSirGlobal mac_ctx, enum QDF_OPMODE type) * Return: false or true. **/ bool -csr_find_session_by_bssid(tpAniSirGlobal mac_ctx, uint8_t *bssid) +csr_find_session_by_bssid(struct mac_context *mac_ctx, uint8_t *bssid) { struct pe_session *session_entry; uint8_t session_id; /* PE session_id */ @@ -20678,7 +20678,7 @@ csr_find_session_by_bssid(tpAniSirGlobal mac_ctx, uint8_t *bssid) * * Return: true or false. **/ -static bool csr_is_conn_allow_2g_band(tpAniSirGlobal mac_ctx, uint32_t chnl) +static bool csr_is_conn_allow_2g_band(struct mac_context *mac_ctx, uint32_t chnl) { uint32_t sap_session_id; struct csr_roam_session *sap_session; @@ -20717,7 +20717,7 @@ static bool csr_is_conn_allow_2g_band(tpAniSirGlobal mac_ctx, uint32_t chnl) * * Return: true or false. **/ -static bool csr_is_conn_allow_5g_band(tpAniSirGlobal mac_ctx, uint32_t chnl) +static bool csr_is_conn_allow_5g_band(struct mac_context *mac_ctx, uint32_t chnl) { uint32_t p2pgo_session_id; struct csr_roam_session *p2pgo_session; @@ -20756,7 +20756,7 @@ static bool csr_is_conn_allow_5g_band(tpAniSirGlobal mac_ctx, uint32_t chnl) * * Return: true or false based on function's overall success. **/ -bool csr_clear_joinreq_param(tpAniSirGlobal mac_ctx, +bool csr_clear_joinreq_param(struct mac_context *mac_ctx, uint32_t session_id) { struct csr_roam_session *sta_session; @@ -20803,7 +20803,7 @@ bool csr_clear_joinreq_param(tpAniSirGlobal mac_ctx, * * Return: true or false based on function's overall success. **/ -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, @@ -20843,7 +20843,7 @@ bool csr_store_joinreq_param(tpAniSirGlobal mac_ctx, * * Return: QDF_STATUS_SUCCESS or QDF_STATUS_E_FAILURE. **/ -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) { @@ -20888,7 +20888,7 @@ QDF_STATUS csr_issue_stored_joinreq(tpAniSirGlobal mac_ctx, * * Return: None */ -void csr_process_set_hw_mode(tpAniSirGlobal mac, tSmeCmd *command) +void csr_process_set_hw_mode(struct mac_context *mac, tSmeCmd *command) { uint32_t len; struct s_sir_set_hw_mode *cmd = NULL; @@ -21004,7 +21004,7 @@ fail: * * Return: None */ -void csr_process_set_dual_mac_config(tpAniSirGlobal mac, tSmeCmd *command) +void csr_process_set_dual_mac_config(struct mac_context *mac, tSmeCmd *command) { uint32_t len; struct sir_set_dual_mac_cfg *cmd; @@ -21074,7 +21074,7 @@ fail: * * Return: None */ -void csr_process_set_antenna_mode(tpAniSirGlobal mac, tSmeCmd *command) +void csr_process_set_antenna_mode(struct mac_context *mac, tSmeCmd *command) { uint32_t len; struct sir_set_antenna_mode *cmd; @@ -21139,7 +21139,7 @@ fail: * * Return: None */ -void csr_process_nss_update_req(tpAniSirGlobal mac, tSmeCmd *command) +void csr_process_nss_update_req(struct mac_context *mac, tSmeCmd *command) { uint32_t len; struct sir_nss_update_request *msg; @@ -21198,7 +21198,7 @@ fail: * * Return: None */ -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) { @@ -21240,7 +21240,7 @@ void csr_copy_fils_join_rsp_roam_info(struct csr_roam_info *roam_info, #endif #ifdef WLAN_FEATURE_ROAM_OFFLOAD -static QDF_STATUS csr_process_roam_sync_callback(tpAniSirGlobal mac_ctx, +static QDF_STATUS csr_process_roam_sync_callback(struct mac_context *mac_ctx, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc, enum sir_roam_op_code reason) { @@ -21648,7 +21648,7 @@ static QDF_STATUS csr_process_roam_sync_callback(tpAniSirGlobal mac_ctx, * * Return: Success or Failure. */ -QDF_STATUS csr_roam_synch_callback(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_roam_synch_callback(struct mac_context *mac_ctx, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc, enum sir_roam_op_code reason) { diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index 5a67019bb405..6fc0c47e9b78 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/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); diff --git a/core/sme/src/csr/csr_cmd_process.c b/core/sme/src/csr/csr_cmd_process.c index a6f58cd4061c..3696d1edc550 100644 --- a/core/sme/src/csr/csr_cmd_process.c +++ b/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; diff --git a/core/sme/src/csr/csr_host_scan_roam.c b/core/sme/src/csr/csr_host_scan_roam.c index 4f6475d79e62..4865ce1e7b81 100644 --- a/core/sme/src/csr/csr_host_scan_roam.c +++ b/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) { diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h index d1cd4cca323c..f4f04ca233cd 100644 --- a/core/sme/src/csr/csr_inside_api.h +++ b/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_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(tpAniSirGlobal mac); -QDF_STATUS csr_scan_close(tpAniSirGlobal mac); -bool csr_scan_append_bss_description(tpAniSirGlobal 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); diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index b2050a2848e2..a507d7971437 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/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 = diff --git a/core/sme/src/csr/csr_roam_preauth.c b/core/sme/src/csr/csr_roam_preauth.c index 3ec985d43a8f..3a16974b421f 100644 --- a/core/sme/src/csr/csr_roam_preauth.c +++ b/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 = diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 0bf43ea66b4c..6ab7a18bc6c7 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -608,7 +608,7 @@ bool csr_is_bss_id_equal(tSirBssDescription *pSirBssDesc1, return fEqual; } -static bool csr_is_conn_state(tpAniSirGlobal mac_ctx, uint32_t session_id, +static bool csr_is_conn_state(struct mac_context *mac_ctx, uint32_t session_id, eCsrConnectState state) { QDF_BUG(session_id < CSR_ROAM_SESSION_MAX); @@ -618,53 +618,53 @@ static bool csr_is_conn_state(tpAniSirGlobal mac_ctx, uint32_t session_id, return mac_ctx->roam.roamSession[session_id].connectState == state; } -bool csr_is_conn_state_connected_ibss(tpAniSirGlobal mac_ctx, +bool csr_is_conn_state_connected_ibss(struct mac_context *mac_ctx, uint32_t session_id) { return csr_is_conn_state(mac_ctx, session_id, eCSR_ASSOC_STATE_TYPE_IBSS_CONNECTED); } -bool csr_is_conn_state_disconnected_ibss(tpAniSirGlobal mac_ctx, +bool csr_is_conn_state_disconnected_ibss(struct mac_context *mac_ctx, uint32_t session_id) { return csr_is_conn_state(mac_ctx, session_id, eCSR_ASSOC_STATE_TYPE_IBSS_DISCONNECTED); } -bool csr_is_conn_state_connected_infra(tpAniSirGlobal mac_ctx, +bool csr_is_conn_state_connected_infra(struct mac_context *mac_ctx, uint32_t session_id) { return csr_is_conn_state(mac_ctx, session_id, eCSR_ASSOC_STATE_TYPE_INFRA_ASSOCIATED); } -bool csr_is_conn_state_connected(tpAniSirGlobal mac, uint32_t sessionId) +bool csr_is_conn_state_connected(struct mac_context *mac, uint32_t sessionId) { return csr_is_conn_state_connected_ibss(mac, sessionId) || csr_is_conn_state_connected_infra(mac, sessionId) || csr_is_conn_state_connected_wds(mac, sessionId); } -bool csr_is_conn_state_infra(tpAniSirGlobal mac, uint32_t sessionId) +bool csr_is_conn_state_infra(struct mac_context *mac, uint32_t sessionId) { return csr_is_conn_state_connected_infra(mac, sessionId); } -bool csr_is_conn_state_ibss(tpAniSirGlobal mac, uint32_t sessionId) +bool csr_is_conn_state_ibss(struct mac_context *mac, uint32_t sessionId) { return csr_is_conn_state_connected_ibss(mac, sessionId) || csr_is_conn_state_disconnected_ibss(mac, sessionId); } -bool csr_is_conn_state_connected_wds(tpAniSirGlobal mac_ctx, +bool csr_is_conn_state_connected_wds(struct mac_context *mac_ctx, uint32_t session_id) { return csr_is_conn_state(mac_ctx, session_id, eCSR_ASSOC_STATE_TYPE_WDS_CONNECTED); } -bool csr_is_conn_state_connected_infra_ap(tpAniSirGlobal mac_ctx, +bool csr_is_conn_state_connected_infra_ap(struct mac_context *mac_ctx, uint32_t session_id) { return csr_is_conn_state(mac_ctx, session_id, @@ -673,20 +673,20 @@ bool csr_is_conn_state_connected_infra_ap(tpAniSirGlobal mac_ctx, eCSR_ASSOC_STATE_TYPE_INFRA_DISCONNECTED); } -bool csr_is_conn_state_disconnected_wds(tpAniSirGlobal mac_ctx, +bool csr_is_conn_state_disconnected_wds(struct mac_context *mac_ctx, uint32_t session_id) { return csr_is_conn_state(mac_ctx, session_id, eCSR_ASSOC_STATE_TYPE_WDS_DISCONNECTED); } -bool csr_is_conn_state_wds(tpAniSirGlobal mac, uint32_t sessionId) +bool csr_is_conn_state_wds(struct mac_context *mac, uint32_t sessionId) { return csr_is_conn_state_connected_wds(mac, sessionId) || csr_is_conn_state_disconnected_wds(mac, sessionId); } -static bool csr_is_conn_state_ap(tpAniSirGlobal mac, uint32_t sessionId) +static bool csr_is_conn_state_ap(struct mac_context *mac, uint32_t sessionId) { struct csr_roam_session *pSession; @@ -698,7 +698,7 @@ static bool csr_is_conn_state_ap(tpAniSirGlobal mac, uint32_t sessionId) return false; } -bool csr_is_any_session_in_connect_state(tpAniSirGlobal mac) +bool csr_is_any_session_in_connect_state(struct mac_context *mac) { uint32_t i; bool fRc = false; @@ -716,7 +716,7 @@ bool csr_is_any_session_in_connect_state(tpAniSirGlobal mac) return fRc; } -int8_t csr_get_infra_session_id(tpAniSirGlobal mac) +int8_t csr_get_infra_session_id(struct mac_context *mac) { uint8_t i; int8_t sessionid = -1; @@ -732,7 +732,7 @@ int8_t csr_get_infra_session_id(tpAniSirGlobal mac) return sessionid; } -uint8_t csr_get_infra_operation_channel(tpAniSirGlobal mac, uint8_t sessionId) +uint8_t csr_get_infra_operation_channel(struct mac_context *mac, uint8_t sessionId) { uint8_t channel; @@ -746,7 +746,7 @@ uint8_t csr_get_infra_operation_channel(tpAniSirGlobal mac, uint8_t sessionId) return channel; } -bool csr_is_session_client_and_connected(tpAniSirGlobal mac, uint8_t sessionId) +bool csr_is_session_client_and_connected(struct mac_context *mac, uint8_t sessionId) { struct csr_roam_session *pSession = NULL; @@ -774,7 +774,7 @@ bool csr_is_session_client_and_connected(tpAniSirGlobal mac, uint8_t sessionId) * * Return: uint8_t */ -uint8_t csr_get_concurrent_operation_channel(tpAniSirGlobal mac_ctx) +uint8_t csr_get_concurrent_operation_channel(struct mac_context *mac_ctx) { struct csr_roam_session *session = NULL; uint8_t i = 0; @@ -828,7 +828,7 @@ uint8_t csr_get_concurrent_operation_channel(tpAniSirGlobal mac_ctx) * * Return: none */ -static void csr_get_ch_from_ht_profile(tpAniSirGlobal mac, +static void csr_get_ch_from_ht_profile(struct mac_context *mac, tCsrRoamHTProfile *htp, uint16_t och, uint16_t *cfreq, uint16_t *hbw) @@ -900,7 +900,7 @@ ret: * * Return: none */ -static void csr_calc_chb_for_sap_phymode(tpAniSirGlobal mac_ctx, +static void csr_calc_chb_for_sap_phymode(struct mac_context *mac_ctx, uint16_t *sap_ch, eCsrPhyMode *sap_phymode, uint16_t *sap_cch, uint16_t *sap_hbw, uint8_t *chb) { @@ -973,7 +973,7 @@ static void csr_calc_chb_for_sap_phymode(tpAniSirGlobal mac_ctx, * * Return: none */ -static void csr_handle_conc_chnl_overlap_for_sap_go(tpAniSirGlobal mac_ctx, +static void csr_handle_conc_chnl_overlap_for_sap_go(struct mac_context *mac_ctx, struct csr_roam_session *session, uint16_t *sap_ch, uint16_t *sap_hbw, uint16_t *sap_cfreq, uint16_t *intf_ch, uint16_t *intf_hbw, uint16_t *intf_cfreq) @@ -1019,7 +1019,7 @@ static void csr_handle_conc_chnl_overlap_for_sap_go(tpAniSirGlobal mac_ctx, * * Return: uint16_t */ -uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal mac_ctx, +uint16_t csr_check_concurrent_channel_overlap(struct mac_context *mac_ctx, uint16_t sap_ch, eCsrPhyMode sap_phymode, uint8_t cc_switch_mode) { @@ -1155,7 +1155,7 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal mac_ctx, } #endif -bool csr_is_all_session_disconnected(tpAniSirGlobal mac) +bool csr_is_all_session_disconnected(struct mac_context *mac) { uint32_t i; bool fRc = true; @@ -1180,7 +1180,7 @@ bool csr_is_all_session_disconnected(tpAniSirGlobal mac) * * Return: true or false */ -bool csr_is_sta_session_connected(tpAniSirGlobal mac_ctx) +bool csr_is_sta_session_connected(struct mac_context *mac_ctx) { uint32_t i; struct csr_roam_session *pSession = NULL; @@ -1209,7 +1209,7 @@ bool csr_is_sta_session_connected(tpAniSirGlobal mac_ctx) * * Return: true or false */ -bool csr_is_p2p_session_connected(tpAniSirGlobal mac) +bool csr_is_p2p_session_connected(struct mac_context *mac) { uint32_t i; struct csr_roam_session *pSession = NULL; @@ -1235,7 +1235,7 @@ bool csr_is_p2p_session_connected(tpAniSirGlobal mac) return false; } -bool csr_is_any_session_connected(tpAniSirGlobal mac) +bool csr_is_any_session_connected(struct mac_context *mac) { uint32_t i, count; bool fRc = false; @@ -1252,7 +1252,7 @@ bool csr_is_any_session_connected(tpAniSirGlobal mac) return fRc; } -bool csr_is_infra_connected(tpAniSirGlobal mac) +bool csr_is_infra_connected(struct mac_context *mac) { uint32_t i; bool fRc = false; @@ -1268,7 +1268,7 @@ bool csr_is_infra_connected(tpAniSirGlobal mac) return fRc; } -uint8_t csr_get_connected_infra(tpAniSirGlobal mac_ctx) +uint8_t csr_get_connected_infra(struct mac_context *mac_ctx) { uint32_t i; uint8_t connected_session = CSR_SESSION_ID_INVALID; @@ -1285,7 +1285,7 @@ uint8_t csr_get_connected_infra(tpAniSirGlobal mac_ctx) } -bool csr_is_concurrent_infra_connected(tpAniSirGlobal mac) +bool csr_is_concurrent_infra_connected(struct mac_context *mac) { uint32_t i, noOfConnectedInfra = 0; @@ -1304,7 +1304,7 @@ bool csr_is_concurrent_infra_connected(tpAniSirGlobal mac) return fRc; } -bool csr_is_ibss_started(tpAniSirGlobal mac) +bool csr_is_ibss_started(struct mac_context *mac) { uint32_t i; bool fRc = false; @@ -1320,7 +1320,7 @@ bool csr_is_ibss_started(tpAniSirGlobal mac) return fRc; } -bool csr_is_concurrent_session_running(tpAniSirGlobal mac) +bool csr_is_concurrent_session_running(struct mac_context *mac) { uint32_t sessionId, noOfCocurrentSession = 0; eCsrConnectState connectState; @@ -1348,7 +1348,7 @@ bool csr_is_concurrent_session_running(tpAniSirGlobal mac) return fRc; } -bool csr_is_infra_ap_started(tpAniSirGlobal mac) +bool csr_is_infra_ap_started(struct mac_context *mac) { uint32_t sessionId; bool fRc = false; @@ -1366,7 +1366,7 @@ bool csr_is_infra_ap_started(tpAniSirGlobal mac) } -bool csr_is_conn_state_disconnected(tpAniSirGlobal mac, uint32_t sessionId) +bool csr_is_conn_state_disconnected(struct mac_context *mac, uint32_t sessionId) { return eCSR_ASSOC_STATE_TYPE_NOT_CONNECTED == mac->roam.roamSession[sessionId].connectState; @@ -1382,7 +1382,7 @@ bool csr_is_conn_state_disconnected(tpAniSirGlobal mac, uint32_t sessionId) * * Return: true or false */ -bool csr_is_valid_mc_concurrent_session(tpAniSirGlobal mac_ctx, +bool csr_is_valid_mc_concurrent_session(struct mac_context *mac_ctx, uint32_t session_id, tSirBssDescription *bss_descr) { @@ -1445,28 +1445,28 @@ bool csr_is_privacy(tSirBssDescription *pSirBssDesc) return (bool) dot11Caps.privacy; } -bool csr_is11d_supported(tpAniSirGlobal mac) +bool csr_is11d_supported(struct mac_context *mac) { return mac->roam.configParam.Is11dSupportEnabled; } -bool csr_is11h_supported(tpAniSirGlobal mac) +bool csr_is11h_supported(struct mac_context *mac) { return mac->roam.configParam.Is11hSupportEnabled; } -bool csr_is11e_supported(tpAniSirGlobal mac) +bool csr_is11e_supported(struct mac_context *mac) { return mac->roam.configParam.Is11eSupportEnabled; } -bool csr_is_mcc_supported(tpAniSirGlobal mac) +bool csr_is_mcc_supported(struct mac_context *mac) { return mac->roam.configParam.fenableMCCMode; } -bool csr_is_wmm_supported(tpAniSirGlobal mac) +bool csr_is_wmm_supported(struct mac_context *mac) { if (eCsrRoamWmmNoQos == mac->roam.configParam.WMMSupportMode) return false; @@ -1475,7 +1475,7 @@ bool csr_is_wmm_supported(tpAniSirGlobal mac) } /* pIes is the IEs for pSirBssDesc2 */ -bool csr_is_ssid_equal(tpAniSirGlobal mac, +bool csr_is_ssid_equal(struct mac_context *mac, tSirBssDescription *pSirBssDesc1, tSirBssDescription *pSirBssDesc2, tDot11fBeaconIEs *pIes2) @@ -1523,7 +1523,7 @@ bool csr_is_ssid_equal(tpAniSirGlobal mac, } /* pIes can be passed in as NULL if the caller doesn't have one prepared */ -static bool csr_is_bss_description_wme(tpAniSirGlobal mac, +static bool csr_is_bss_description_wme(struct mac_context *mac, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes) { @@ -1557,7 +1557,7 @@ static bool csr_is_bss_description_wme(tpAniSirGlobal mac, return fWme; } -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) { @@ -1597,7 +1597,7 @@ eCsrMediaAccessType csr_get_qos_from_bss_desc(tpAniSirGlobal mac_ctx, } /* 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) { @@ -1620,7 +1620,7 @@ 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) { @@ -1684,18 +1684,18 @@ bool csr_is_nullssid(uint8_t *pBssSsid, uint8_t len) return fNullSsid; } -uint32_t csr_get_frag_thresh(tpAniSirGlobal mac_ctx) +uint32_t csr_get_frag_thresh(struct mac_context *mac_ctx) { return mac_ctx->mlme_cfg->threshold.frag_threshold; } -uint32_t csr_get_rts_thresh(tpAniSirGlobal mac_ctx) +uint32_t csr_get_rts_thresh(struct mac_context *mac_ctx) { return mac_ctx->mlme_cfg->threshold.rts_threshold; } static eCsrPhyMode -csr_translate_to_phy_mode_from_bss_desc(tpAniSirGlobal mac_ctx, +csr_translate_to_phy_mode_from_bss_desc(struct mac_context *mac_ctx, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *ies) { @@ -1743,7 +1743,7 @@ csr_translate_to_phy_mode_from_bss_desc(tpAniSirGlobal mac_ctx, return phyMode; } -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) { uint32_t ret; @@ -1828,7 +1828,7 @@ uint32_t csr_translate_to_wni_cfg_dot11_mode(tpAniSirGlobal mac, * * Return: success **/ -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) { @@ -1865,7 +1865,7 @@ QDF_STATUS csr_get_phy_mode_from_bss(tpAniSirGlobal mac, * * Return: true or false */ -static bool csr_get_phy_mode_in_use(tpAniSirGlobal mac_ctx, +static bool csr_get_phy_mode_in_use(struct mac_context *mac_ctx, eCsrPhyMode phyModeIn, eCsrPhyMode bssPhyMode, bool f5GhzBand, @@ -2078,7 +2078,7 @@ static bool csr_get_phy_mode_in_use(tpAniSirGlobal mac_ctx, * * Return: true or false based on mode that fits the criteria */ -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, @@ -2174,7 +2174,7 @@ bool csr_is_phy_mode_match(tpAniSirGlobal mac, uint32_t phyMode, return fMatch; } -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) { enum csr_cfgdot11mode cfgDot11ModeToUse; @@ -2221,7 +2221,7 @@ enum csr_cfgdot11mode csr_find_best_phy_mode(tpAniSirGlobal mac, return cfgDot11ModeToUse; } -uint32_t csr_get11h_power_constraint(tpAniSirGlobal mac_ctx, +uint32_t csr_get11h_power_constraint(struct mac_context *mac_ctx, tDot11fIEPowerConstraints *constraints) { uint32_t localPowerConstraint = 0; @@ -2342,7 +2342,7 @@ bool csr_is_profile_rsn(struct csr_roam_profile *pProfile) * * Return: QDF_STATUS */ -static QDF_STATUS csr_update_mcc_p2p_beacon_interval(tpAniSirGlobal mac_ctx) +static QDF_STATUS csr_update_mcc_p2p_beacon_interval(struct mac_context *mac_ctx) { uint32_t session_id = 0; struct csr_roam_session *roam_session; @@ -2386,7 +2386,7 @@ static QDF_STATUS csr_update_mcc_p2p_beacon_interval(tpAniSirGlobal mac_ctx) return QDF_STATUS_E_FAILURE; } -static uint16_t csr_calculate_mcc_beacon_interval(tpAniSirGlobal mac, +static uint16_t csr_calculate_mcc_beacon_interval(struct mac_context *mac, uint16_t sta_bi, uint16_t go_gbi) { @@ -2455,7 +2455,7 @@ static uint16_t csr_calculate_mcc_beacon_interval(tpAniSirGlobal mac, * * Return: bool */ -static bool csr_validate_p2pcli_bcn_intrvl(tpAniSirGlobal mac_ctx, +static bool csr_validate_p2pcli_bcn_intrvl(struct mac_context *mac_ctx, uint8_t chnl_id, uint16_t *bcn_interval, uint32_t session_id, QDF_STATUS *status) { @@ -2493,7 +2493,7 @@ static bool csr_validate_p2pcli_bcn_intrvl(tpAniSirGlobal mac_ctx, * * Return: bool */ -static bool csr_validate_p2pgo_bcn_intrvl(tpAniSirGlobal mac_ctx, +static bool csr_validate_p2pgo_bcn_intrvl(struct mac_context *mac_ctx, uint8_t chnl_id, uint16_t *bcn_interval, uint32_t session_id, QDF_STATUS *status) { @@ -2557,7 +2557,7 @@ static bool csr_validate_p2pgo_bcn_intrvl(tpAniSirGlobal mac_ctx, * * Return: bool */ -static bool csr_validate_sta_bcn_intrvl(tpAniSirGlobal mac_ctx, +static bool csr_validate_sta_bcn_intrvl(struct mac_context *mac_ctx, uint8_t chnl_id, uint16_t *bcn_interval, uint32_t session_id, QDF_STATUS *status) { @@ -2667,7 +2667,7 @@ static bool csr_validate_sta_bcn_intrvl(tpAniSirGlobal mac_ctx, * * Return: QDF_STATUS */ -QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_validate_mcc_beacon_interval(struct mac_context *mac_ctx, uint8_t chnl_id, uint16_t *bcn_interval, uint32_t cur_session_id, @@ -2732,7 +2732,7 @@ QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal mac_ctx, * * Return: true if is 11R auth type, false otherwise */ -bool csr_is_auth_type11r(tpAniSirGlobal mac, eCsrAuthType auth_type, +bool csr_is_auth_type11r(struct mac_context *mac, eCsrAuthType auth_type, uint8_t mdie_present) { switch (auth_type) { @@ -2751,7 +2751,7 @@ bool csr_is_auth_type11r(tpAniSirGlobal mac, eCsrAuthType auth_type, } /* Function to return true if the profile is 11r */ -bool csr_is_profile11r(tpAniSirGlobal mac, +bool csr_is_profile11r(struct mac_context *mac, struct csr_roam_profile *pProfile) { return csr_is_auth_type11r(mac, pProfile->negotiatedAuthType, @@ -2810,13 +2810,13 @@ bool csr_is_profile_wapi(struct csr_roam_profile *pProfile) return fWapiProfile; } -static bool csr_is_wapi_oui_equal(tpAniSirGlobal mac, uint8_t *Oui1, +static bool csr_is_wapi_oui_equal(struct mac_context *mac, uint8_t *Oui1, uint8_t *Oui2) { return !qdf_mem_cmp(Oui1, Oui2, CSR_WAPI_OUI_SIZE); } -static bool csr_is_wapi_oui_match(tpAniSirGlobal mac, +static bool csr_is_wapi_oui_match(struct mac_context *mac, uint8_t AllCyphers[][CSR_WAPI_OUI_SIZE], uint8_t cAllCyphers, uint8_t Cypher[], uint8_t Oui[]) @@ -2838,13 +2838,13 @@ static bool csr_is_wapi_oui_match(tpAniSirGlobal mac, } #endif /* FEATURE_WLAN_WAPI */ -static bool csr_is_wpa_oui_equal(tpAniSirGlobal mac, uint8_t *Oui1, +static bool csr_is_wpa_oui_equal(struct mac_context *mac, uint8_t *Oui1, uint8_t *Oui2) { return !qdf_mem_cmp(Oui1, Oui2, CSR_WPA_OUI_SIZE); } -static bool csr_is_oui_match(tpAniSirGlobal mac, +static bool csr_is_oui_match(struct mac_context *mac, uint8_t AllCyphers[][CSR_WPA_OUI_SIZE], uint8_t cAllCyphers, uint8_t Cypher[], uint8_t Oui[]) { @@ -2864,7 +2864,7 @@ static bool csr_is_oui_match(tpAniSirGlobal mac, return fYes; } -static bool csr_match_rsnoui_index(tpAniSirGlobal mac, +static bool csr_match_rsnoui_index(struct mac_context *mac, uint8_t AllCyphers[][CSR_RSN_OUI_SIZE], uint8_t cAllCyphers, uint8_t ouiIndex, uint8_t Oui[]) @@ -2875,7 +2875,7 @@ static bool csr_match_rsnoui_index(tpAniSirGlobal mac, } #ifdef FEATURE_WLAN_WAPI -static bool csr_match_wapi_oui_index(tpAniSirGlobal mac, +static bool csr_match_wapi_oui_index(struct mac_context *mac, uint8_t AllCyphers[][CSR_WAPI_OUI_SIZE], uint8_t cAllCyphers, uint8_t ouiIndex, uint8_t Oui[]) @@ -2887,7 +2887,7 @@ static bool csr_match_wapi_oui_index(tpAniSirGlobal mac, #endif /* FEATURE_WLAN_WAPI */ #ifndef WLAN_CONV_CRYPTO_IE_SUPPORT -static bool csr_match_wpaoui_index(tpAniSirGlobal mac, +static bool csr_match_wpaoui_index(struct mac_context *mac, uint8_t AllCyphers[][CSR_RSN_OUI_SIZE], uint8_t cAllCyphers, uint8_t ouiIndex, uint8_t Oui[]) @@ -2902,7 +2902,7 @@ static bool csr_match_wpaoui_index(tpAniSirGlobal mac, #endif #ifdef FEATURE_WLAN_WAPI -static bool csr_is_auth_wapi_cert(tpAniSirGlobal mac, +static bool csr_is_auth_wapi_cert(struct mac_context *mac, uint8_t AllSuites[][CSR_WAPI_OUI_SIZE], uint8_t cAllSuites, uint8_t Oui[]) { @@ -2910,7 +2910,7 @@ static bool csr_is_auth_wapi_cert(tpAniSirGlobal mac, (mac, AllSuites, cAllSuites, csr_wapi_oui[1], Oui); } -static bool csr_is_auth_wapi_psk(tpAniSirGlobal mac, +static bool csr_is_auth_wapi_psk(struct mac_context *mac, uint8_t AllSuites[][CSR_WAPI_OUI_SIZE], uint8_t cAllSuites, uint8_t Oui[]) { @@ -2924,7 +2924,7 @@ static bool csr_is_auth_wapi_psk(tpAniSirGlobal mac, * Function for 11R FT Authentication. We match the FT Authentication Cipher * suite here. This matches for FT Auth with the 802.1X exchange. */ -static bool csr_is_ft_auth_rsn(tpAniSirGlobal mac, +static bool csr_is_ft_auth_rsn(struct mac_context *mac, uint8_t AllSuites[][CSR_RSN_OUI_SIZE], uint8_t cAllSuites, uint8_t Oui[]) { @@ -2936,7 +2936,7 @@ static bool csr_is_ft_auth_rsn(tpAniSirGlobal mac, * Function for 11R FT Authentication. We match the FT Authentication Cipher * suite here. This matches for FT Auth with the PSK. */ -static bool csr_is_ft_auth_rsn_psk(tpAniSirGlobal mac, +static bool csr_is_ft_auth_rsn_psk(struct mac_context *mac, uint8_t AllSuites[][CSR_RSN_OUI_SIZE], uint8_t cAllSuites, uint8_t Oui[]) { @@ -2952,7 +2952,7 @@ static bool csr_is_ft_auth_rsn_psk(tpAniSirGlobal mac, * Authentication Key Management suite here. This matches for CCKM AKM Auth * with the 802.1X exchange. */ -static bool csr_is_ese_cckm_auth_rsn(tpAniSirGlobal mac, +static bool csr_is_ese_cckm_auth_rsn(struct mac_context *mac, uint8_t AllSuites[][CSR_RSN_OUI_SIZE], uint8_t cAllSuites, uint8_t Oui[]) { @@ -2961,7 +2961,7 @@ static bool csr_is_ese_cckm_auth_rsn(tpAniSirGlobal mac, } #ifndef WLAN_CONV_CRYPTO_IE_SUPPORT -static bool csr_is_ese_cckm_auth_wpa(tpAniSirGlobal mac, +static bool csr_is_ese_cckm_auth_wpa(struct mac_context *mac, uint8_t AllSuites[][CSR_WPA_OUI_SIZE], uint8_t cAllSuites, uint8_t Oui[]) { @@ -2972,7 +2972,7 @@ static bool csr_is_ese_cckm_auth_wpa(tpAniSirGlobal mac, #endif -static bool csr_is_auth_rsn(tpAniSirGlobal mac, +static bool csr_is_auth_rsn(struct mac_context *mac, uint8_t AllSuites[][CSR_RSN_OUI_SIZE], uint8_t cAllSuites, uint8_t Oui[]) { @@ -2980,7 +2980,7 @@ static bool csr_is_auth_rsn(tpAniSirGlobal mac, (mac, AllSuites, cAllSuites, csr_rsn_oui[01], Oui); } -static bool csr_is_auth_rsn_psk(tpAniSirGlobal mac, +static bool csr_is_auth_rsn_psk(struct mac_context *mac, uint8_t AllSuites[][CSR_RSN_OUI_SIZE], uint8_t cAllSuites, uint8_t Oui[]) { @@ -2989,14 +2989,14 @@ static bool csr_is_auth_rsn_psk(tpAniSirGlobal mac, } #ifdef WLAN_FEATURE_11W -static bool csr_is_auth_rsn_psk_sha256(tpAniSirGlobal mac, +static bool csr_is_auth_rsn_psk_sha256(struct mac_context *mac, uint8_t AllSuites[][CSR_RSN_OUI_SIZE], uint8_t cAllSuites, uint8_t Oui[]) { return csr_is_oui_match (mac, AllSuites, cAllSuites, csr_rsn_oui[07], Oui); } -static bool csr_is_auth_rsn8021x_sha256(tpAniSirGlobal mac, +static bool csr_is_auth_rsn8021x_sha256(struct mac_context *mac, uint8_t AllSuites[][CSR_RSN_OUI_SIZE], uint8_t cAllSuites, uint8_t Oui[]) { @@ -3015,7 +3015,7 @@ static bool csr_is_auth_rsn8021x_sha256(tpAniSirGlobal mac, * * Return: True if OUI is FILS SHA256, false otherwise */ -static bool csr_is_auth_fils_sha256(tpAniSirGlobal mac, +static bool csr_is_auth_fils_sha256(struct mac_context *mac, uint8_t all_suites[][CSR_RSN_OUI_SIZE], uint8_t suite_count, uint8_t oui[]) { @@ -3032,7 +3032,7 @@ static bool csr_is_auth_fils_sha256(tpAniSirGlobal mac, * * Return: True if OUI is FILS SHA384, false otherwise */ -static bool csr_is_auth_fils_sha384(tpAniSirGlobal mac, +static bool csr_is_auth_fils_sha384(struct mac_context *mac, uint8_t all_suites[][CSR_RSN_OUI_SIZE], uint8_t suite_count, uint8_t oui[]) { @@ -3049,7 +3049,7 @@ static bool csr_is_auth_fils_sha384(tpAniSirGlobal mac, * * Return: True if OUI is FT FILS SHA256, false otherwise */ -static bool csr_is_auth_fils_ft_sha256(tpAniSirGlobal mac, +static bool csr_is_auth_fils_ft_sha256(struct mac_context *mac, uint8_t all_suites[][CSR_RSN_OUI_SIZE], uint8_t suite_count, uint8_t oui[]) { @@ -3066,7 +3066,7 @@ static bool csr_is_auth_fils_ft_sha256(tpAniSirGlobal mac, * * Return: True if OUI is FT FILS SHA384, false otherwise */ -static bool csr_is_auth_fils_ft_sha384(tpAniSirGlobal mac, +static bool csr_is_auth_fils_ft_sha384(struct mac_context *mac, uint8_t all_suites[][CSR_RSN_OUI_SIZE], uint8_t suite_count, uint8_t oui[]) { @@ -3084,7 +3084,7 @@ static bool csr_is_auth_fils_ft_sha384(tpAniSirGlobal mac, * * Return: True if OUI is dpp rsn, false otherwise */ -static bool csr_is_auth_dpp_rsn(tpAniSirGlobal mac, +static bool csr_is_auth_dpp_rsn(struct mac_context *mac, uint8_t all_suites[][CSR_RSN_OUI_SIZE], uint8_t suite_count, uint8_t oui[]) { @@ -3101,7 +3101,7 @@ static bool csr_is_auth_dpp_rsn(tpAniSirGlobal mac, * * Return: True if OUI is OWE, false otherwise */ -static bool csr_is_auth_wpa_owe(tpAniSirGlobal mac, +static bool csr_is_auth_wpa_owe(struct mac_context *mac, uint8_t all_suites[][CSR_RSN_OUI_SIZE], uint8_t suite_count, uint8_t oui[]) { @@ -3118,7 +3118,7 @@ static bool csr_is_auth_wpa_owe(tpAniSirGlobal mac, * * Return: True if OUI is SuiteB EAP256, false otherwise */ -static bool csr_is_auth_suiteb_eap_256(tpAniSirGlobal mac, +static bool csr_is_auth_suiteb_eap_256(struct mac_context *mac, uint8_t all_suites[][CSR_RSN_OUI_SIZE], uint8_t suite_count, uint8_t oui[]) { @@ -3135,7 +3135,7 @@ static bool csr_is_auth_suiteb_eap_256(tpAniSirGlobal mac, * * Return: True if OUI is SuiteB EAP384, false otherwise */ -static bool csr_is_auth_suiteb_eap_384(tpAniSirGlobal mac, +static bool csr_is_auth_suiteb_eap_384(struct mac_context *mac, uint8_t all_suites[][CSR_RSN_OUI_SIZE], uint8_t suite_count, uint8_t oui[]) { @@ -3153,7 +3153,7 @@ static bool csr_is_auth_suiteb_eap_384(tpAniSirGlobal mac, * * Return: True if OUI is SAE, false otherwise */ -static bool csr_is_auth_wpa_sae(tpAniSirGlobal mac, +static bool csr_is_auth_wpa_sae(struct mac_context *mac, uint8_t all_suites[][CSR_RSN_OUI_SIZE], uint8_t suite_count, uint8_t oui[]) { @@ -3163,7 +3163,7 @@ static bool csr_is_auth_wpa_sae(tpAniSirGlobal mac, #endif #ifndef WLAN_CONV_CRYPTO_IE_SUPPORT -static bool csr_is_auth_wpa(tpAniSirGlobal mac, +static bool csr_is_auth_wpa(struct mac_context *mac, uint8_t AllSuites[][CSR_WPA_OUI_SIZE], uint8_t cAllSuites, uint8_t Oui[]) { @@ -3171,7 +3171,7 @@ static bool csr_is_auth_wpa(tpAniSirGlobal mac, (mac, AllSuites, cAllSuites, csr_wpa_oui[01], Oui); } -static bool csr_is_auth_wpa_psk(tpAniSirGlobal mac, +static bool csr_is_auth_wpa_psk(struct mac_context *mac, uint8_t AllSuites[][CSR_WPA_OUI_SIZE], uint8_t cAllSuites, uint8_t Oui[]) { @@ -3189,7 +3189,7 @@ static bool csr_is_auth_wpa_psk(tpAniSirGlobal mac, * * Return: True if OUI is GMAC_128, false otherwise */ -static bool csr_is_group_mgmt_gmac_128(tpAniSirGlobal mac, +static bool csr_is_group_mgmt_gmac_128(struct mac_context *mac, uint8_t AllSuites[][CSR_RSN_OUI_SIZE], uint8_t cAllSuites, uint8_t Oui[]) { @@ -3206,7 +3206,7 @@ static bool csr_is_group_mgmt_gmac_128(tpAniSirGlobal mac, * * Return: True if OUI is GMAC_256, false otherwise */ -static bool csr_is_group_mgmt_gmac_256(tpAniSirGlobal mac, +static bool csr_is_group_mgmt_gmac_256(struct mac_context *mac, uint8_t AllSuites[][CSR_RSN_OUI_SIZE], uint8_t cAllSuites, uint8_t Oui[]) { @@ -3268,7 +3268,7 @@ static uint8_t csr_get_oui_index_from_cipher(eCsrEncryptionType enType) * * Return: None */ -static void csr_is_fils_auth(tpAniSirGlobal mac_ctx, +static void csr_is_fils_auth(struct mac_context *mac_ctx, uint8_t authsuites[][CSR_RSN_OUI_SIZE], uint8_t c_auth_suites, uint8_t authentication[], tCsrAuthList *auth_type, uint8_t index, eCsrAuthType *neg_authtype) @@ -3307,7 +3307,7 @@ static void csr_is_fils_auth(tpAniSirGlobal mac_ctx, sme_debug("negotiated auth type is %d", *neg_authtype); } #else -static void csr_is_fils_auth(tpAniSirGlobal mac_ctx, +static void csr_is_fils_auth(struct mac_context *mac_ctx, uint8_t authsuites[][CSR_RSN_OUI_SIZE], uint8_t c_auth_suites, uint8_t authentication[], tCsrAuthList *auth_type, uint8_t index, eCsrAuthType *neg_authtype) @@ -3328,7 +3328,7 @@ static void csr_is_fils_auth(tpAniSirGlobal mac_ctx, * * Return: None */ -static void csr_check_sae_auth(tpAniSirGlobal mac_ctx, +static void csr_check_sae_auth(struct mac_context *mac_ctx, uint8_t authsuites[][CSR_RSN_OUI_SIZE], uint8_t c_auth_suites, uint8_t authentication[], tCsrAuthList *auth_type, uint8_t index, eCsrAuthType *neg_authtype) @@ -3342,7 +3342,7 @@ static void csr_check_sae_auth(tpAniSirGlobal mac_ctx, sme_debug("negotiated auth type is %d", *neg_authtype); } #else -static void csr_check_sae_auth(tpAniSirGlobal mac_ctx, +static void csr_check_sae_auth(struct mac_context *mac_ctx, uint8_t authsuites[][CSR_RSN_OUI_SIZE], uint8_t c_auth_suites, uint8_t authentication[], tCsrAuthList *auth_type, uint8_t index, eCsrAuthType *neg_authtype) @@ -3370,7 +3370,7 @@ static void csr_check_sae_auth(tpAniSirGlobal mac_ctx, * * Return: bool */ -static bool csr_get_rsn_information(tpAniSirGlobal mac_ctx, +static bool csr_get_rsn_information(struct mac_context *mac_ctx, tCsrAuthList *auth_type, eCsrEncryptionType encr_type, tCsrEncryptionList *mc_encryption, @@ -3640,7 +3640,7 @@ end: * to make connection with it. Else we will return false **/ static bool -csr_is_pmf_capabilities_in_rsn_match(tpAniSirGlobal mac, +csr_is_pmf_capabilities_in_rsn_match(struct mac_context *mac, bool *pFilterMFPEnabled, uint8_t *pFilterMFPRequired, uint8_t *pFilterMFPCapable, @@ -3683,7 +3683,7 @@ csr_is_pmf_capabilities_in_rsn_match(tpAniSirGlobal mac, } #endif -static bool csr_is_rsn_match(tpAniSirGlobal mac_ctx, tCsrAuthList *pAuthType, +static bool csr_is_rsn_match(struct mac_context *mac_ctx, tCsrAuthList *pAuthType, eCsrEncryptionType enType, tCsrEncryptionList *pEnMcType, bool *pMFPEnabled, uint8_t *pMFPRequired, @@ -3724,7 +3724,7 @@ static bool csr_is_rsn_match(tpAniSirGlobal mac_ctx, tCsrAuthList *pAuthType, * * Return: true if pmkid is found else false */ -static bool csr_lookup_pmkid_using_ssid(tpAniSirGlobal mac, +static bool csr_lookup_pmkid_using_ssid(struct mac_context *mac, struct csr_roam_session *session, tPmkidCacheInfo *pmk_cache, uint32_t *index) @@ -3756,7 +3756,7 @@ static bool csr_lookup_pmkid_using_ssid(tpAniSirGlobal mac, } #endif -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) @@ -3791,7 +3791,7 @@ bool csr_lookup_pmkid_using_bssid(tpAniSirGlobal mac, * * Return: true if pmkid is found else false */ -static bool csr_lookup_pmkid(tpAniSirGlobal mac, uint32_t sessionId, +static bool csr_lookup_pmkid(struct mac_context *mac, uint32_t sessionId, tPmkidCacheInfo *pmk_cache) { bool fRC = false, fMatchFound = false; @@ -3906,7 +3906,7 @@ static inline void csr_update_pmksa_to_profile(struct csr_roam_profile *profile, #endif #ifdef WLAN_CONV_CRYPTO_IE_SUPPORT -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) @@ -3953,7 +3953,7 @@ static inline void csr_update_session_pmk(struct csr_roam_session *session, } #endif -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) @@ -4168,7 +4168,7 @@ uint8_t csr_construct_rsn_ie(tpAniSirGlobal mac, uint32_t sessionId, * * Return: bool */ -static bool csr_get_wapi_information(tpAniSirGlobal mac_ctx, +static bool csr_get_wapi_information(struct mac_context *mac_ctx, tCsrAuthList *auth_type, eCsrEncryptionType encr_type, tCsrEncryptionList *mc_encryption, @@ -4283,7 +4283,7 @@ end: return acceptable_cipher; } -static bool csr_is_wapi_match(tpAniSirGlobal mac_ctx, tCsrAuthList *pAuthType, +static bool csr_is_wapi_match(struct mac_context *mac_ctx, tCsrAuthList *pAuthType, eCsrEncryptionType enType, tCsrEncryptionList *pEnMcType, tDot11fBeaconIEs *pIes, @@ -4305,7 +4305,7 @@ static bool csr_is_wapi_match(tpAniSirGlobal mac_ctx, tCsrAuthList *pAuthType, } #ifndef WLAN_CONV_CRYPTO_IE_SUPPORT -static bool csr_lookup_bkid(tpAniSirGlobal mac, uint32_t sessionId, +static bool csr_lookup_bkid(struct mac_context *mac, uint32_t sessionId, uint8_t *pBSSId, uint8_t *pBKId) { bool fRC = false, fMatchFound = false; @@ -4347,7 +4347,7 @@ static bool csr_lookup_bkid(tpAniSirGlobal mac, uint32_t sessionId, #endif #ifdef WLAN_CONV_CRYPTO_IE_SUPPORT -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) @@ -4372,7 +4372,7 @@ uint8_t csr_construct_wapi_ie(tpAniSirGlobal mac, uint32_t sessionId, return ie_len; } #else -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) @@ -4498,7 +4498,7 @@ uint8_t csr_construct_wapi_ie(tpAniSirGlobal mac, uint32_t sessionId, * * Return: bool */ -static bool csr_get_wpa_cyphers(tpAniSirGlobal mac_ctx, tCsrAuthList *auth_type, +static bool csr_get_wpa_cyphers(struct mac_context *mac_ctx, tCsrAuthList *auth_type, eCsrEncryptionType encr_type, tCsrEncryptionList *mc_encryption, tDot11fIEWPA *wpa_ie, uint8_t *ucast_cipher, @@ -4628,7 +4628,7 @@ end: return acceptable_cipher; } -static bool csr_is_wpa_encryption_match(tpAniSirGlobal mac, +static bool csr_is_wpa_encryption_match(struct mac_context *mac, tCsrAuthList *pAuthType, eCsrEncryptionType enType, tCsrEncryptionList *pEnMcType, @@ -4652,7 +4652,7 @@ static bool csr_is_wpa_encryption_match(tpAniSirGlobal mac, #endif #ifdef WLAN_CONV_CRYPTO_IE_SUPPORT -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) @@ -4677,7 +4677,7 @@ uint8_t csr_construct_wpa_ie(tpAniSirGlobal mac, uint8_t session_id, return ie_len; } #else -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) @@ -4764,7 +4764,7 @@ uint8_t csr_construct_wpa_ie(tpAniSirGlobal mac, uint8_t session_id, * 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) @@ -4797,7 +4797,7 @@ uint8_t csr_retrieve_wpa_ie(tpAniSirGlobal mac, uint8_t session_id, * one from the BSS Caller allocated memory for pWpaIe and guarrantee * 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) @@ -4834,7 +4834,7 @@ uint8_t csr_retrieve_rsn_ie(tpAniSirGlobal mac, uint32_t sessionId, * 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) @@ -4981,7 +4981,7 @@ tAniEdType csr_translate_encrypt_type_to_ed_type(eCsrEncryptionType EncryptType) * * Return: bool */ -static bool csr_validate_wep(tpAniSirGlobal mac_ctx, +static bool csr_validate_wep(struct mac_context *mac_ctx, eCsrEncryptionType uc_encry_type, tCsrAuthList *auth_list, tCsrEncryptionList *mc_encryption_list, @@ -5145,7 +5145,7 @@ static bool csr_validate_open_none(tSirBssDescription *bss_desc, * * Return: Boolean value to tell if matched or not. */ -static bool csr_validate_any_default(tpAniSirGlobal mac_ctx, +static bool csr_validate_any_default(struct mac_context *mac_ctx, tCsrAuthList *auth_type, tCsrEncryptionList *mc_enc_type, bool *mfp_enabled, @@ -5244,7 +5244,7 @@ static bool csr_validate_any_default(tpAniSirGlobal mac_ctx, * * Return: Boolean value to tell if matched or not. */ -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, @@ -5369,7 +5369,7 @@ bool csr_is_security_match(tpAniSirGlobal mac_ctx, tCsrAuthList *auth_type, return match; } -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 fMatch = false; @@ -5508,7 +5508,7 @@ bool csr_is_bss_type_ibss(eCsrRoamBssType bssType) * Return: true if the adapter is currently capable of supporting this rate */ -static bool csr_is_aggregate_rate_supported(tpAniSirGlobal mac_ctx, +static bool csr_is_aggregate_rate_supported(struct mac_context *mac_ctx, uint16_t rate) { bool supported = false; @@ -5749,7 +5749,7 @@ bool csr_check_rate_bitmap(uint8_t rate, uint16_t rateBitmap) return !!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 n = BITS_OFF(rate, CSR_DOT11_BASIC_RATE_MASK); @@ -5901,7 +5901,7 @@ static inline void csr_free_fils_profile_info(struct csr_roam_profile *profile) { } #endif -void csr_release_profile(tpAniSirGlobal mac, struct csr_roam_profile *pProfile) +void csr_release_profile(struct mac_context *mac, struct csr_roam_profile *pProfile) { if (pProfile) { if (pProfile->BSSIDs.bssid) { @@ -5945,7 +5945,7 @@ void csr_release_profile(tpAniSirGlobal mac, struct csr_roam_profile *pProfile) } } -void csr_free_scan_filter(tpAniSirGlobal mac, tCsrScanResultFilter +void csr_free_scan_filter(struct mac_context *mac, tCsrScanResultFilter *pScanFilter) { if (pScanFilter->BSSIDs.bssid) { @@ -5962,7 +5962,7 @@ void csr_free_scan_filter(tpAniSirGlobal mac, tCsrScanResultFilter } } -void csr_free_roam_profile(tpAniSirGlobal mac, uint32_t sessionId) +void csr_free_roam_profile(struct mac_context *mac, uint32_t sessionId) { struct csr_roam_session *pSession = &mac->roam.roamSession[sessionId]; @@ -5973,7 +5973,7 @@ void csr_free_roam_profile(tpAniSirGlobal mac, uint32_t sessionId) } } -void csr_free_connect_bss_desc(tpAniSirGlobal mac, uint32_t sessionId) +void csr_free_connect_bss_desc(struct mac_context *mac, uint32_t sessionId) { struct csr_roam_session *pSession = &mac->roam.roamSession[sessionId]; @@ -5998,7 +5998,7 @@ tSirResultCodes csr_get_de_auth_rsp_status_code(tSirSmeDeauthRsp *pSmeRsp) return (tSirResultCodes) ret; } -tSirScanType csr_get_scan_type(tpAniSirGlobal mac, uint8_t chnId) +tSirScanType csr_get_scan_type(struct mac_context *mac, uint8_t chnId) { tSirScanType scanType = eSIR_PASSIVE_SCAN; enum channel_state channelEnabledType; @@ -6128,7 +6128,7 @@ csr_get_cfg_dot11_mode_from_csr_phy_mode(struct csr_roam_profile *pProfile, return cfgDot11Mode; } -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) @@ -6159,7 +6159,7 @@ QDF_STATUS csr_get_regulatory_domain_for_country(tpAniSirGlobal mac, return status; } -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) @@ -6174,7 +6174,7 @@ QDF_STATUS csr_get_modify_profile_fields(tpAniSirGlobal mac, return QDF_STATUS_SUCCESS; } -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) @@ -6188,7 +6188,7 @@ QDF_STATUS csr_set_modify_profile_fields(tpAniSirGlobal mac, } -bool csr_is_set_key_allowed(tpAniSirGlobal mac, uint32_t sessionId) +bool csr_is_set_key_allowed(struct mac_context *mac, uint32_t sessionId) { bool fRet = true; struct csr_roam_session *pSession; @@ -6230,7 +6230,7 @@ uint16_t sme_chn_to_freq(uint8_t chanNum) } 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) { uint8_t i; struct lim_scan_channel_status *channel_status; @@ -6250,7 +6250,7 @@ csr_get_channel_status(tpAniSirGlobal mac, uint32_t channel_id) return NULL; } -void csr_clear_channel_status(tpAniSirGlobal mac) +void csr_clear_channel_status(struct mac_context *mac) { struct lim_scan_channel_status *channel_status; @@ -6331,7 +6331,7 @@ QDF_STATUS csr_add_to_channel_list_front(uint8_t *pChannelList, * * Return: True if the wait was successful, false otherwise */ -bool csr_wait_for_connection_update(tpAniSirGlobal mac, +bool csr_wait_for_connection_update(struct mac_context *mac, bool do_release_reacquire_lock) { QDF_STATUS status, ret; @@ -6371,7 +6371,7 @@ bool csr_wait_for_connection_update(tpAniSirGlobal mac, * * Reture: enum QDF_OPMODE persona */ -enum QDF_OPMODE csr_get_session_persona(tpAniSirGlobal pmac, +enum QDF_OPMODE csr_get_session_persona(struct mac_context *pmac, uint32_t session_id) { struct csr_roam_session *session = NULL; @@ -6390,7 +6390,7 @@ enum QDF_OPMODE csr_get_session_persona(tpAniSirGlobal pmac, * * returns: true if NDI is started, false otherwise */ -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) { struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id); @@ -6400,7 +6400,7 @@ bool csr_is_ndi_started(tpAniSirGlobal mac_ctx, uint32_t session_id) return eCSR_CONNECT_STATE_TYPE_NDI_STARTED == session->connectState; } -bool csr_is_mcc_channel(tpAniSirGlobal mac_ctx, uint8_t channel) +bool csr_is_mcc_channel(struct mac_context *mac_ctx, uint8_t channel) { struct csr_roam_session *session; enum QDF_OPMODE oper_mode;