From 66ee8a92fe2965a632ba83c7680b30d2c801eb11 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sat, 17 Mar 2018 15:24:26 -0700 Subject: [PATCH] qcacld-3.0: Replace typedef tCsrRoamProfile The Linux Coding Style enumerates a few special cases where typedefs are useful, but stresses "NEVER EVER use a typedef unless you can clearly match one of those rules." The tCsrRoamProfile typedef does not meet any of those criteria, so replace references to it with a reference to the underlying struct. Change-Id: Ie78bc34c5c39a56058d0daa0240047ec67392ab3 CRs-Fixed: 2207843 --- core/sap/inc/sap_api.h | 2 +- core/sap/src/sap_api_link_cntl.c | 2 +- core/sap/src/sap_fsm.c | 12 +- core/sap/src/sap_internal.h | 6 +- core/sap/src/sap_module.c | 2 +- core/sme/inc/csr_api.h | 8 +- core/sme/inc/csr_internal.h | 18 +-- core/sme/inc/csr_neighbor_roam.h | 10 +- core/sme/inc/csr_support.h | 31 ++--- core/sme/inc/sme_api.h | 33 +++--- core/sme/inc/sme_nan_datapath.h | 8 +- core/sme/inc/sme_qos_internal.h | 4 +- core/sme/src/common/sme_api.c | 33 +++--- core/sme/src/csr/csr_api_roam.c | 163 +++++++++++++------------- core/sme/src/csr/csr_api_scan.c | 22 ++-- core/sme/src/csr/csr_host_scan_roam.c | 4 +- core/sme/src/csr/csr_inside_api.h | 63 +++++----- core/sme/src/csr/csr_neighbor_roam.c | 4 +- core/sme/src/csr/csr_util.c | 52 ++++---- core/sme/src/nan/nan_datapath_api.c | 4 +- 20 files changed, 250 insertions(+), 231 deletions(-) diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h index 5bd3a24f9ef5..c8a78e589447 100644 --- a/core/sap/inc/sap_api.h +++ b/core/sap/inc/sap_api.h @@ -1281,7 +1281,7 @@ QDF_STATUS wlansap_set_dfs_target_chnl(tHalHandle hHal, * * Return: SAP RoamProfile */ -tCsrRoamProfile *wlan_sap_get_roam_profile(struct sap_context *sap_ctx); +struct csr_roam_profile *wlan_sap_get_roam_profile(struct sap_context *sap_ctx); /** * wlan_sap_get_phymode() - Returns sap phymode. diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c index 6263239a4d9b..d19d23532bd4 100644 --- a/core/sap/src/sap_api_link_cntl.c +++ b/core/sap/src/sap_api_link_cntl.c @@ -1065,7 +1065,7 @@ wlansap_roam_callback(void *ctx, struct csr_roam_info *csr_roam_info, /* Issue stopbss for each sapctx */ for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { struct sap_context *pSapContext; - tCsrRoamProfile *profile; + struct csr_roam_profile *profile; if (((QDF_SAP_MODE == mac_ctx->sap.sapCtxList[intf].sapPersona) || diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index c7cbd8279267..c45511d4e00e 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -1913,7 +1913,7 @@ static QDF_STATUS sap_cac_start_notify(tHalHandle hHal) for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { struct sap_context *pSapContext = pMac->sap.sapCtxList[intf].pSapContext; - tCsrRoamProfile *profile; + struct csr_roam_profile *profile; if (((QDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) || @@ -2013,7 +2013,7 @@ static QDF_STATUS sap_cac_end_notify(tHalHandle hHal, for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { struct sap_context *pSapContext = pMac->sap.sapCtxList[intf].pSapContext; - tCsrRoamProfile *profile; + struct csr_roam_profile *profile; if (((QDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) || @@ -2369,7 +2369,7 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(struct sap_context *sap_ctx, for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { struct sap_context *t_sap_ctx; - tCsrRoamProfile *profile; + struct csr_roam_profile *profile; t_sap_ctx = mac_ctx->sap.sapCtxList[intf].pSapContext; if (((QDF_SAP_MODE == @@ -2591,7 +2591,7 @@ static QDF_STATUS sap_fsm_state_started(struct sap_context *sap_ctx, */ for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { struct sap_context *temp_sap_ctx; - tCsrRoamProfile *profile; + struct csr_roam_profile *profile; if (((QDF_SAP_MODE == mac_ctx->sap.sapCtxList[intf].sapPersona) || @@ -2790,7 +2790,7 @@ QDF_STATUS sap_fsm(struct sap_context *sap_ctx, ptWLAN_SAPEvent sap_event) eSapStatus sapconvert_to_csr_profile(tsap_Config_t *pconfig_params, eCsrRoamBssType bssType, - tCsrRoamProfile *profile) + struct csr_roam_profile *profile) { /* Create Roam profile for SoftAP to connect */ profile->BSSType = eCSR_BSS_TYPE_INFRA_AP; @@ -2963,7 +2963,7 @@ sapconvert_to_csr_profile(tsap_Config_t *pconfig_params, eCsrRoamBssType bssType return eSAP_STATUS_SUCCESS; /* Success. */ } -void sap_free_roam_profile(tCsrRoamProfile *profile) +void sap_free_roam_profile(struct csr_roam_profile *profile) { if (profile->pRSNReqIE) { qdf_mem_free(profile->pRSNReqIE); diff --git a/core/sap/src/sap_internal.h b/core/sap/src/sap_internal.h index c9ac56d1014b..6c86834765e8 100644 --- a/core/sap/src/sap_internal.h +++ b/core/sap/src/sap_internal.h @@ -156,7 +156,7 @@ struct sap_context { uint8_t ucSecEnabled; /* Include the SME(CSR) context here */ - tCsrRoamProfile csr_roamProfile; + struct csr_roam_profile csr_roamProfile; uint32_t csr_roamId; /* SAP event Callback to hdd */ @@ -337,9 +337,9 @@ QDF_STATUS sap_fsm(struct sap_context *sapContext, ptWLAN_SAPEvent sapEvent); eSapStatus sapconvert_to_csr_profile(tsap_Config_t *pconfig_params, eCsrRoamBssType bssType, - tCsrRoamProfile *profile); + struct csr_roam_profile *profile); -void sap_free_roam_profile(tCsrRoamProfile *profile); +void sap_free_roam_profile(struct csr_roam_profile *profile); QDF_STATUS sap_is_peer_mac_allowed(struct sap_context *sapContext, uint8_t *peerMac); diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 5d1a5a73628a..abb980c3777f 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -559,7 +559,7 @@ wlansap_set_scan_acs_channel_params(tsap_Config_t *pconfig, * * Return: SAP RoamProfile */ -tCsrRoamProfile *wlan_sap_get_roam_profile(struct sap_context *sap_ctx) +struct csr_roam_profile *wlan_sap_get_roam_profile(struct sap_context *sap_ctx) { if (!sap_ctx) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index 76d93d40e2b2..33595a3049ab 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -393,7 +393,7 @@ typedef enum { eCSR_ROAM_CONNECT_COMPLETION, /* * an association or start_IBSS operation starts, - * callback may get a pointer to tCsrRoamProfile and + * callback may get a pointer to struct csr_roam_profile and * a pointer to tSirBssDescription */ eCSR_ROAM_ASSOCIATION_START, @@ -823,7 +823,7 @@ typedef struct tagCsrRoamModifyProfileFields { uint16_t listen_interval; } tCsrRoamModifyProfileFields; -typedef struct csr_roam_profile { +struct csr_roam_profile { tCsrSSIDs SSIDs; tCsrBSSIDs BSSIDs; /* this is bit mask of all the needed phy mode defined in eCsrPhyMode */ @@ -920,7 +920,7 @@ typedef struct csr_roam_profile { struct cds_fils_connection_info *fils_con_info; #endif bool force_rsne_override; -} tCsrRoamProfile; +}; #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH typedef struct tagCsrRoamHTProfile { @@ -1340,7 +1340,7 @@ typedef struct tagCsrUpdateConfigParam { #endif struct csr_roam_info { - tCsrRoamProfile *pProfile; + struct csr_roam_profile *pProfile; tSirBssDescription *pBssDesc; uint32_t nBeaconLength; uint32_t nAssocReqLength; diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index cc78e93b0136..74636cd49c61 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -324,7 +324,7 @@ struct csr_roamstart_bssparams { struct roam_cmd { uint32_t roamId; enum csr_roam_reason roamReason; - tCsrRoamProfile roamProfile; + struct csr_roam_profile roamProfile; tScanResultHandle hBSSList; /* BSS list fits the profile */ /* * point to the current BSS in the list that is roaming. @@ -813,7 +813,7 @@ struct csr_roam_offload_synch_params { struct csr_roam_stored_profile { uint32_t session_id; - tCsrRoamProfile profile; + struct csr_roam_profile profile; tScanResultHandle bsslist_handle; enum csr_roam_reason reason; uint32_t roam_id; @@ -832,7 +832,7 @@ struct csr_roam_stored_profile { struct scan_cmd_info { wlan_scan_id scan_id; enum csr_scan_reason scan_reason; - tCsrRoamProfile *profile; + struct csr_roam_profile *profile; uint32_t roam_id; tListElem *roambssentry; }; @@ -869,7 +869,7 @@ struct csr_roam_session { eCsrConnectState connectState; tCsrRoamConnectedProfile connectedProfile; struct csr_roam_connectedinfo connectedInfo; - tCsrRoamProfile *pCurRoamProfile; + struct csr_roam_profile *pCurRoamProfile; tSirBssDescription *pConnectBssDesc; uint16_t NumPmkidCache; /* valid number of pmkid in the cache*/ uint16_t curr_cache_idx; /* the index in pmkidcache to write next to */ @@ -1268,14 +1268,14 @@ QDF_STATUS csr_roam_get_wapi_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf); uint8_t csr_construct_wapi_ie(tpAniSirGlobal pMac, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe); #endif /* FEATURE_WLAN_WAPI */ void csr_set_cfg_privacy(tpAniSirGlobal pMac, - tCsrRoamProfile *pProfile, - bool fPrivacy); + struct csr_roam_profile *pProfile, + bool fPrivacy); int8_t csr_get_infra_session_id(tpAniSirGlobal pMac); uint8_t csr_get_infra_operation_channel(tpAniSirGlobal pMac, uint8_t sessionId); @@ -1342,7 +1342,7 @@ bool csr_roam_is_sta_mode(tpAniSirGlobal pMac, uint32_t sessionId); QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, struct qdf_mac_addr bssid, struct ch_params *ch_params, - tCsrRoamProfile *profile); + struct csr_roam_profile *profile); /* Post Beacon Tx Start Indication */ QDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal pMac, @@ -1379,7 +1379,7 @@ static inline void csr_roaming_report_diag_event( #endif bool csr_store_joinreq_param(tpAniSirGlobal mac_ctx, - tCsrRoamProfile *profile, + struct csr_roam_profile *profile, tScanResultHandle scan_cache, uint32_t *roam_id, uint32_t session_id); diff --git a/core/sme/inc/csr_neighbor_roam.h b/core/sme/inc/csr_neighbor_roam.h index 615812fcfb40..9cc16847e3c2 100644 --- a/core/sme/inc/csr_neighbor_roam.h +++ b/core/sme/inc/csr_neighbor_roam.h @@ -150,7 +150,7 @@ typedef struct sCsrNeighborRoamControlInfo { uint8_t currentOpportunisticThresholdDiff; uint8_t currentRoamRescanRssiDiff; tDblLinkList roamableAPList; /* List of current FT candidates */ - tCsrRoamProfile csrNeighborRoamProfile; + struct csr_roam_profile csrNeighborRoamProfile; bool is11rAssoc; tCsr11rAssocNeighborInfo FTRoamInfo; #ifdef FEATURE_WLAN_ESE @@ -203,7 +203,7 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac, tpCsrNeighborRoamBSSInfo pHandoffNode, uint8_t sessionId); QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pSirBssDesc, - tDot11fBeaconIEs *pIes, tCsrRoamProfile *pProfile); + tDot11fBeaconIEs *pIes, struct csr_roam_profile *pProfile); void csr_neighbor_roam_request_handoff(tpAniSirGlobal pMac, uint8_t sessionId); QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, void *pMsg); @@ -227,7 +227,7 @@ static inline QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, } static inline QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pSirBssDesc, - tDot11fBeaconIEs *pIes, tCsrRoamProfile *pProfile) + tDot11fBeaconIEs *pIes, struct csr_roam_profile *pProfile) { return QDF_STATUS_E_NOSUPPORT; } @@ -371,7 +371,7 @@ uint8_t csr_get_roam_enabled_sta_sessionid( * Return: QDF_STATUS */ QDF_STATUS csr_update_fils_config(tpAniSirGlobal mac, uint8_t session_id, - tCsrRoamProfile *src_profile); + struct csr_roam_profile *src_profile); #endif QDF_STATUS csr_neighbor_roam_handoff_req_hdlr(tpAniSirGlobal pMac, void *pMsg); @@ -425,7 +425,7 @@ static inline void csr_neighbor_roam_send_lfr_metric_event( #endif QDF_STATUS csr_roam_stop_wait_for_key_timer(tpAniSirGlobal pMac); QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, - uint32_t sessionId, tCsrRoamProfile *pDstProfile); + uint32_t sessionId, struct csr_roam_profile *pDstProfile); /** * csr_invoke_neighbor_report_request - Send neighbor report invoke command to diff --git a/core/sme/inc/csr_support.h b/core/sme/inc/csr_support.h index 0c537dbee789..e1820b0a0625 100644 --- a/core/sme/inc/csr_support.h +++ b/core/sme/inc/csr_support.h @@ -251,38 +251,41 @@ eCsrPhyMode csr_get_phy_mode_from_bssDesc(tSirBssDescription *pSirBssDesc); uint32_t csr_get11h_power_constraint(tHalHandle hHal, tDot11fIEPowerConstraints *pPowerConstraint); uint8_t csr_construct_rsn_ie(tHalHandle hHal, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrRSNIe *pRSNIe); -uint8_t csr_construct_wpa_ie(tHalHandle hHal, tCsrRoamProfile *pProfile, - tSirBssDescription *pSirBssDesc, - tDot11fBeaconIEs *pIes, tCsrWpaIe *pWpaIe); + +uint8_t csr_construct_wpa_ie(tHalHandle hHal, struct csr_roam_profile *pProfile, + tSirBssDescription *pSirBssDesc, + tDot11fBeaconIEs *pIes, tCsrWpaIe *pWpaIe); + #ifdef FEATURE_WLAN_WAPI -bool csr_is_profile_wapi(tCsrRoamProfile *pProfile); +bool csr_is_profile_wapi(struct csr_roam_profile *pProfile); #endif /* FEATURE_WLAN_WAPI */ /* * If a WPAIE exists in the profile, just use it. * 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(tHalHandle hHal, tCsrRoamProfile *pProfile, - tSirBssDescription *pSirBssDesc, - tDot11fBeaconIEs *pIes, tCsrWpaIe *pWpaIe); +uint8_t csr_retrieve_wpa_ie(tHalHandle hHal, struct csr_roam_profile *pProfile, + tSirBssDescription *pSirBssDesc, + tDot11fBeaconIEs *pIes, tCsrWpaIe *pWpaIe); + bool csr_is_ssid_equal(tHalHandle hHal, tSirBssDescription *pSirBssDesc1, tSirBssDescription *pSirBssDesc2, tDot11fBeaconIEs *pIes2); /* Null ssid means match */ bool csr_is_ssid_in_list(tHalHandle hHal, tSirMacSSid *pSsid, tCsrSSIDs *pSsidList); -bool csr_is_profile_wpa(tCsrRoamProfile *pProfile); -bool csr_is_profile_rsn(tCsrRoamProfile *pProfile); +bool csr_is_profile_wpa(struct csr_roam_profile *pProfile); +bool csr_is_profile_rsn(struct csr_roam_profile *pProfile); /* * If a RSNIE exists in the profile, just use it. 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_rsn_ie(tHalHandle hHal, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrRSNIe *pRsnIe); #ifdef FEATURE_WLAN_WAPI @@ -292,7 +295,7 @@ uint8_t csr_retrieve_rsn_ie(tHalHandle hHal, uint32_t sessionId, * guarrantee it can contain a max length WAPI IE */ uint8_t csr_retrieve_wapi_ie(tHalHandle hHal, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe); #endif /* FEATURE_WLAN_WAPI */ @@ -354,10 +357,10 @@ QDF_STATUS csr_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, uint8_t channelId, uint16_t *beaconInterval, uint32_t cursessionId, enum QDF_OPMODE currBssPersona); -bool csr_is_profile11r(tCsrRoamProfile *pProfile); +bool csr_is_profile11r(struct csr_roam_profile *pProfile); bool csr_is_auth_type11r(eCsrAuthType AuthType, uint8_t mdiePresent); #ifdef FEATURE_WLAN_ESE -bool csr_is_profile_ese(tCsrRoamProfile *pProfile); +bool csr_is_profile_ese(struct csr_roam_profile *pProfile); #endif /** diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index 8d63092b8a91..c0081d197224 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -358,14 +358,14 @@ QDF_STATUS sme_scan_get_result(tHalHandle hHal, uint8_t sessionId, tCsrScanResultFilter *pFilter, tScanResultHandle *phResult); QDF_STATUS sme_get_ap_channel_from_scan_cache( - tCsrRoamProfile *profile, + struct csr_roam_profile *profile, tScanResultHandle *scan_cache, uint8_t *ap_chnl_id); QDF_STATUS sme_get_ap_channel_from_scan(void *profile, tScanResultHandle *scan_cache, uint8_t *ap_chnl_id); bool sme_store_joinreq_param(tHalHandle hal_handle, - tCsrRoamProfile *profile, + struct csr_roam_profile *profile, tScanResultHandle scan_cache, uint32_t *roam_id, uint32_t session_id); @@ -383,9 +383,9 @@ tCsrScanResultInfo *sme_scan_result_get_next(tHalHandle, tScanResultHandle hScanResult); QDF_STATUS sme_scan_result_purge(tScanResultHandle hScanResult); QDF_STATUS sme_roam_connect(tHalHandle hHal, uint8_t sessionId, - tCsrRoamProfile *pProfile, uint32_t *pRoamId); + struct csr_roam_profile *pProfile, uint32_t *pRoamId); QDF_STATUS sme_roam_reassoc(tHalHandle hHal, uint8_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tCsrRoamModifyProfileFields modProfileFields, uint32_t *pRoamId, bool fForce); QDF_STATUS sme_roam_connect_to_last_profile(tHalHandle hHal, uint8_t sessionId); @@ -532,8 +532,8 @@ QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, uint8_t device_mode, uint8_t *macAddr, uint8_t sessionId); -void sme_set_cfg_privacy(tHalHandle hHal, tCsrRoamProfile *pProfile, - bool fPrivacy); +void sme_set_cfg_privacy(tHalHandle hHal, struct csr_roam_profile *pProfile, + bool fPrivacy); void sme_get_recovery_stats(tHalHandle hHal); QDF_STATUS sme_neighbor_report_request(tHalHandle hHal, uint8_t sessionId, tpRrmNeighborReq pRrmNeighborReq, @@ -815,7 +815,7 @@ QDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_value); QDF_STATUS sme_roam_channel_change_req(tHalHandle hHal, struct qdf_mac_addr bssid, struct ch_params *ch_params, - tCsrRoamProfile *profile); + struct csr_roam_profile *profile); QDF_STATUS sme_roam_start_beacon_req(tHalHandle hHal, struct qdf_mac_addr bssid, uint8_t dfsCacWaitStatus); @@ -1545,7 +1545,8 @@ void sme_set_chan_info_callback(tHalHandle hal_handle, * * Return: QDF_STATUS */ -QDF_STATUS sme_get_rssi_snr_by_bssid(tHalHandle hal, tCsrRoamProfile *profile, +QDF_STATUS sme_get_rssi_snr_by_bssid(tHalHandle hal, + struct csr_roam_profile *profile, const uint8_t *bssid, int8_t *rssi, int8_t *snr); @@ -1561,10 +1562,10 @@ QDF_STATUS sme_get_rssi_snr_by_bssid(tHalHandle hal, tCsrRoamProfile *profile, * * Return: QDF_STATUS */ -QDF_STATUS sme_get_beacon_frm(tHalHandle hal, tCsrRoamProfile *profile, - const tSirMacAddr bssid, - uint8_t **frame_buf, uint32_t *frame_len, - int *channel); +QDF_STATUS sme_get_beacon_frm(tHalHandle hal, struct csr_roam_profile *profile, + const tSirMacAddr bssid, + uint8_t **frame_buf, uint32_t *frame_len, + int *channel); #ifdef WLAN_FEATURE_ROAM_OFFLOAD /** @@ -1578,7 +1579,7 @@ QDF_STATUS sme_get_beacon_frm(tHalHandle hal, tCsrRoamProfile *profile, * * Return: QDF_STATUS */ -QDF_STATUS sme_fast_reassoc(tHalHandle hal, tCsrRoamProfile *profile, +QDF_STATUS sme_fast_reassoc(tHalHandle hal, struct csr_roam_profile *profile, const tSirMacAddr bssid, int channel, uint8_t vdev_id, const tSirMacAddr connected_bssid); #endif @@ -1940,7 +1941,7 @@ QDF_STATUS sme_set_del_pmkid_cache(tHalHandle hal, uint8_t session_id, * Return: QDF_STATUS */ void sme_send_hlp_ie_info(tHalHandle hal, uint8_t session_id, - tCsrRoamProfile *profile, uint32_t if_addr); + struct csr_roam_profile *profile, uint32_t if_addr); #if defined(WLAN_FEATURE_FILS_SK) /** @@ -1955,7 +1956,7 @@ void sme_send_hlp_ie_info(tHalHandle hal, uint8_t session_id, * Return: QDF_STATUS */ QDF_STATUS sme_update_fils_config(tHalHandle hal, uint8_t session_id, - tCsrRoamProfile *src_profile); + struct csr_roam_profile *src_profile); /** * sme_free_join_rsp_fils_params - free fils params @@ -1967,7 +1968,7 @@ void sme_free_join_rsp_fils_params(struct csr_roam_info *roam_info); #else static inline QDF_STATUS sme_update_fils_config(tHalHandle hal, uint8_t session_id, - tCsrRoamProfile *src_profile) + struct csr_roam_profile *src_profile) { return QDF_STATUS_SUCCESS; } diff --git a/core/sme/inc/sme_nan_datapath.h b/core/sme/inc/sme_nan_datapath.h index bf4b20fe76cf..36dfe8ba8eed 100644 --- a/core/sme/inc/sme_nan_datapath.h +++ b/core/sme/inc/sme_nan_datapath.h @@ -32,11 +32,11 @@ #ifdef WLAN_FEATURE_NAN_DATAPATH /* Start NDI BSS */ QDF_STATUS csr_roam_start_ndi(tpAniSirGlobal mac_ctx, uint32_t session_id, - tCsrRoamProfile *profile); + struct csr_roam_profile *profile); void csr_roam_save_ndi_connected_info(tpAniSirGlobal mac_ctx, uint32_t session_id, - tCsrRoamProfile *roam_profile, + struct csr_roam_profile *roam_profile, tSirBssDescription *bss_desc); void csr_roam_update_ndp_return_params(tpAniSirGlobal mac_ctx, @@ -49,14 +49,14 @@ void csr_roam_update_ndp_return_params(tpAniSirGlobal mac_ctx, /* Start NDI BSS */ static inline QDF_STATUS csr_roam_start_ndi(tpAniSirGlobal mac_ctx, uint32_t session_id, - tCsrRoamProfile *profile) + struct csr_roam_profile *profile) { return QDF_STATUS_SUCCESS; } static inline void csr_roam_save_ndi_connected_info(tpAniSirGlobal mac_ctx, uint32_t session_id, - tCsrRoamProfile *roam_profile, + struct csr_roam_profile *roam_profile, tSirBssDescription *bss_desc) { } diff --git a/core/sme/inc/sme_qos_internal.h b/core/sme/inc/sme_qos_internal.h index 9c66febfa6ea..789043315803 100644 --- a/core/sme/inc/sme_qos_internal.h +++ b/core/sme/inc/sme_qos_internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -107,7 +107,7 @@ typedef enum { ---------------------------------------------------------------------------*/ typedef struct { tSirBssDescription *pBssDesc; - tCsrRoamProfile *pProfile; + struct csr_roam_profile *pProfile; } sme_QosAssocInfo; /*-------------------------------------------------------------------------- diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 15ed41a3000b..8ceed0ca9039 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -2663,7 +2663,7 @@ QDF_STATUS sme_get_ap_channel_from_scan(void *profile, tScanResultHandle *scan_cache, uint8_t *ap_chnl_id) { - return sme_get_ap_channel_from_scan_cache((tCsrRoamProfile *) + return sme_get_ap_channel_from_scan_cache((struct csr_roam_profile *) profile, scan_cache, ap_chnl_id); @@ -2683,7 +2683,7 @@ QDF_STATUS sme_get_ap_channel_from_scan(void *profile, * Return: QDF_STATUS. */ QDF_STATUS sme_get_ap_channel_from_scan_cache( - tCsrRoamProfile *profile, tScanResultHandle *scan_cache, + struct csr_roam_profile *profile, tScanResultHandle *scan_cache, uint8_t *ap_chnl_id) { QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -2790,7 +2790,7 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache( * Return: true or false based on function's overall success. **/ bool sme_store_joinreq_param(tHalHandle hal_handle, - tCsrRoamProfile *profile, + struct csr_roam_profile *profile, tScanResultHandle scan_cache, uint32_t *roam_id, uint32_t session_id) @@ -3134,7 +3134,8 @@ QDF_STATUS sme_get_channel_bonding_mode24_g(tHalHandle hHal, uint32_t *mode) * Return QDF_STATUS */ QDF_STATUS sme_roam_connect(tHalHandle hHal, uint8_t sessionId, - tCsrRoamProfile *pProfile, uint32_t *pRoamId) + struct csr_roam_profile *pProfile, + uint32_t *pRoamId) { QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -3204,7 +3205,7 @@ QDF_STATUS sme_set_phy_mode(tHalHandle hHal, eCsrPhyMode phyMode) * Return QDF_STATUS */ QDF_STATUS sme_roam_reassoc(tHalHandle hHal, uint8_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tCsrRoamModifyProfileFields modProfileFields, uint32_t *pRoamId, bool fForce) { @@ -4721,7 +4722,7 @@ QDF_STATUS sme_tx_fail_monitor_start_stop_ind(tHalHandle hHal, uint8_t * Return void */ void sme_set_cfg_privacy(tHalHandle hHal, - tCsrRoamProfile *pProfile, bool fPrivacy) + struct csr_roam_profile *pProfile, bool fPrivacy) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -6780,7 +6781,7 @@ QDF_STATUS sme_update_roam_rssi_diff(tHalHandle hHal, uint8_t sessionId, #ifdef WLAN_FEATURE_FILS_SK QDF_STATUS sme_update_fils_config(tHalHandle hal, uint8_t session_id, - tCsrRoamProfile *src_profile) + struct csr_roam_profile *src_profile) { tpAniSirGlobal mac = PMAC_STRUCT(hal); QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -6820,7 +6821,7 @@ QDF_STATUS sme_update_fils_config(tHalHandle hal, uint8_t session_id, } void sme_send_hlp_ie_info(tHalHandle hal, uint8_t session_id, - tCsrRoamProfile *profile, uint32_t if_addr) + struct csr_roam_profile *profile, uint32_t if_addr) { int i; struct scheduler_msg msg; @@ -6912,7 +6913,7 @@ void sme_free_join_rsp_fils_params(struct csr_roam_info *roam_info) #else inline void sme_send_hlp_ie_info(tHalHandle hal, uint8_t session_id, - tCsrRoamProfile *profile, uint32_t if_addr) + struct csr_roam_profile *profile, uint32_t if_addr) {} #endif @@ -10618,7 +10619,7 @@ QDF_STATUS sme_set_mas(uint32_t val) QDF_STATUS sme_roam_channel_change_req(tHalHandle hHal, struct qdf_mac_addr bssid, struct ch_params *ch_params, - tCsrRoamProfile *profile) + struct csr_roam_profile *profile) { QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -15144,7 +15145,7 @@ static void sme_prepare_beacon_from_bss_descp(uint8_t *frame_buf, } QDF_STATUS sme_get_rssi_snr_by_bssid(tHalHandle hal, - tCsrRoamProfile *profile, + struct csr_roam_profile *profile, const uint8_t *bssid, int8_t *rssi, int8_t *snr) { @@ -15219,10 +15220,10 @@ free_scan_flter: return status; } -QDF_STATUS sme_get_beacon_frm(tHalHandle hal, tCsrRoamProfile *profile, - const tSirMacAddr bssid, - uint8_t **frame_buf, uint32_t *frame_len, - int *channel) +QDF_STATUS sme_get_beacon_frm(tHalHandle hal, struct csr_roam_profile *profile, + const tSirMacAddr bssid, + uint8_t **frame_buf, uint32_t *frame_len, + int *channel) { QDF_STATUS status = QDF_STATUS_SUCCESS; tScanResultHandle result_handle = NULL; @@ -15317,7 +15318,7 @@ free_scan_flter: } #ifdef WLAN_FEATURE_ROAM_OFFLOAD -QDF_STATUS sme_fast_reassoc(tHalHandle hal, tCsrRoamProfile *profile, +QDF_STATUS sme_fast_reassoc(tHalHandle hal, struct csr_roam_profile *profile, const tSirMacAddr bssid, int channel, uint8_t vdev_id, const tSirMacAddr connected_bssid) { diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 0acd27b9c5fd..88f3fe29b09f 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -267,7 +267,7 @@ static bool csr_roam_process_results(tpAniSirGlobal pMac, tSmeCmd *pCommand, enum csr_roamcomplete_result Result, void *Context); static QDF_STATUS csr_roam_start_ibss(tpAniSirGlobal pMac, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, bool *pfSameIbss); static void csr_roam_update_connected_profile_from_new_bss(tpAniSirGlobal pMac, uint32_t sessionId, @@ -283,7 +283,7 @@ static QDF_STATUS csr_roam_open(tpAniSirGlobal pMac); static QDF_STATUS csr_roam_close(tpAniSirGlobal pMac); static bool csr_roam_is_same_profile_keys(tpAniSirGlobal pMac, tCsrRoamConnectedProfile *pConnProfile, - tCsrRoamProfile *pProfile2); + struct csr_roam_profile *pProfile2); static QDF_STATUS csr_roam_start_roaming_timer(tpAniSirGlobal pMac, uint32_t sessionId, @@ -324,7 +324,7 @@ static void csr_roam_remove_stat_list_entry(tpAniSirGlobal pMac, tListElem *pEntry); static enum csr_cfgdot11mode csr_roam_get_phy_mode_band_for_bss(tpAniSirGlobal pMac, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, uint8_t operationChn, enum band_info *pBand); static QDF_STATUS csr_roam_get_qos_info_from_bss( @@ -353,7 +353,7 @@ static bool csr_is_conn_allow_5g_band(tpAniSirGlobal pMac, uint32_t chnl); static QDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tSirBssDescription *pBssDesc); static void csr_init_session(tpAniSirGlobal pMac, uint32_t sessionId); static QDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac, @@ -4395,7 +4395,7 @@ QDF_STATUS csr_roam_save_connected_bss_desc(tpAniSirGlobal pMac, static QDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tSirBssDescription *pBssDesc, struct bss_config_param *pBssConfig, tDot11fBeaconIEs *pIes) @@ -4545,7 +4545,7 @@ QDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac, } QDF_STATUS csr_roam_prepare_bss_config_from_profile( - tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, + tpAniSirGlobal pMac, struct csr_roam_profile *pProfile, struct bss_config_param *pBssConfig, tSirBssDescription *pBssDesc) { @@ -4677,7 +4677,7 @@ static QDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac, return status; } -void csr_set_cfg_privacy(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, +void csr_set_cfg_privacy(tpAniSirGlobal pMac, struct csr_roam_profile *pProfile, bool fPrivacy) { /* @@ -4900,11 +4900,12 @@ static QDF_STATUS csr_set_qos_to_cfg(tpAniSirGlobal pMac, uint32_t sessionId, } static QDF_STATUS csr_get_rate_set(tpAniSirGlobal pMac, - tCsrRoamProfile *pProfile, eCsrPhyMode phyMode, - tSirBssDescription *pBssDesc, - tDot11fBeaconIEs *pIes, - tSirMacRateSet *pOpRateSet, - tSirMacRateSet *pExRateSet) + struct csr_roam_profile *pProfile, + eCsrPhyMode phyMode, + tSirBssDescription *pBssDesc, + tDot11fBeaconIEs *pIes, + tSirMacRateSet *pOpRateSet, + tSirMacRateSet *pExRateSet) { QDF_STATUS status = QDF_STATUS_E_FAILURE; int i; @@ -4974,7 +4975,7 @@ static QDF_STATUS csr_get_rate_set(tpAniSirGlobal pMac, } static void csr_set_cfg_rate_set(tpAniSirGlobal pMac, eCsrPhyMode phyMode, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes) { @@ -5074,7 +5075,7 @@ static void csr_set_cfg_rate_set(tpAniSirGlobal pMac, eCsrPhyMode phyMode, } static void csr_set_cfg_rate_set_from_profile(tpAniSirGlobal pMac, - tCsrRoamProfile *pProfile) + struct csr_roam_profile *pProfile) { tSirMacRateSetIE DefaultSupportedRates11a = { SIR_MAC_RATESET_EID, {8, @@ -5244,7 +5245,7 @@ void csr_roam_ccm_cfg_set_callback(tpAniSirGlobal pMac, int32_t result, /* pIes may be NULL */ QDF_STATUS csr_roam_set_bss_config_cfg(tpAniSirGlobal pMac, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tSirBssDescription *pBssDesc, struct bss_config_param *pBssConfig, struct sDot11fBeaconIEs *pIes, @@ -5335,7 +5336,7 @@ QDF_STATUS csr_roam_set_bss_config_cfg(tpAniSirGlobal pMac, uint32_t sessionId, static QDF_STATUS csr_roam_stop_network(tpAniSirGlobal pMac, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes) { @@ -5433,7 +5434,7 @@ QDF_STATUS csr_roam_stop_network(tpAniSirGlobal pMac, uint32_t sessionId, * Return: Roaming state. */ static enum csr_join_state csr_roam_state_for_same_profile( - tpAniSirGlobal mac_ctx, tCsrRoamProfile *profile, + tpAniSirGlobal mac_ctx, struct csr_roam_profile *profile, struct csr_roam_session *session, uint32_t session_id, tDot11fBeaconIEs *ies_local, tSirBssDescription *bss_descr) @@ -5467,7 +5468,7 @@ static enum csr_join_state csr_roam_state_for_same_profile( static enum csr_join_state csr_roam_join(tpAniSirGlobal pMac, uint32_t sessionId, tCsrScanResultInfo *pScanResult, - tCsrRoamProfile *pProfile) + struct csr_roam_profile *pProfile) { enum csr_join_state eRoamState = eCsrContinueRoaming; tSirBssDescription *pBssDesc = &pScanResult->BssDescriptor; @@ -5712,7 +5713,7 @@ static void csr_roam_join_handle_profile(tpAniSirGlobal mac_ctx, #endif QDF_STATUS status; struct csr_roam_session *session; - tCsrRoamProfile *profile = &cmd->u.roamCmd.roamProfile; + struct csr_roam_profile *profile = &cmd->u.roamCmd.roamProfile; tDot11fBeaconIEs *ies_local = NULL; if (!CSR_IS_SESSION_VALID(mac_ctx, session_id)) { @@ -5892,7 +5893,7 @@ static enum csr_join_state csr_roam_join_next_bss(tpAniSirGlobal mac_ctx, struct csr_roam_info *roam_info = NULL; uint32_t session_id = cmd->sessionId; struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id); - tCsrRoamProfile *profile = &cmd->u.roamCmd.roamProfile; + struct csr_roam_profile *profile = &cmd->u.roamCmd.roamProfile; struct csr_roam_joinstatus *join_status; tCsrScanResultInfo *result = NULL; @@ -6268,7 +6269,7 @@ QDF_STATUS csr_roam_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) /* Remember the roaming profile */ csr_free_roam_profile(pMac, sessionId); pSession->pCurRoamProfile = - qdf_mem_malloc(sizeof(tCsrRoamProfile)); + qdf_mem_malloc(sizeof(struct csr_roam_profile)); if (NULL != pSession->pCurRoamProfile) { csr_roam_copy_profile(pMac, pSession->pCurRoamProfile, @@ -6969,7 +6970,7 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, void *context) { uint32_t session_id = cmd->sessionId; - tCsrRoamProfile *profile = &cmd->u.roamCmd.roamProfile; + struct csr_roam_profile *profile = &cmd->u.roamCmd.roamProfile; struct csr_roam_session *session; tSirBssDescription *bss_desc = NULL; struct csr_roam_info roam_info; @@ -7264,7 +7265,7 @@ free_fils_join_rsp: * Return: None */ static void csr_process_fils_join_rsp(tpAniSirGlobal mac_ctx, - tCsrRoamProfile *profile, + struct csr_roam_profile *profile, uint32_t session_id, struct csr_roam_info *roam_info, tSirBssDescription *bss_desc, @@ -7314,11 +7315,11 @@ process_fils_join_rsp_fail: #else static inline void csr_process_fils_join_rsp(tpAniSirGlobal mac_ctx, - tCsrRoamProfile *profile, - uint32_t session_id, - struct csr_roam_info *roam_info, - tSirBssDescription *bss_desc, - tSirSmeJoinRsp *join_rsp) + struct csr_roam_profile *profile, + uint32_t session_id, + struct csr_roam_info *roam_info, + tSirBssDescription *bss_desc, + tSirSmeJoinRsp *join_rsp) {} #endif @@ -7341,7 +7342,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, uint32_t key_timeout_interval = 0; uint8_t acm_mask = 0; /* HDD needs ACM mask in assoc rsp callback */ uint32_t session_id = cmd->sessionId; - tCsrRoamProfile *profile = &cmd->u.roamCmd.roamProfile; + struct csr_roam_profile *profile = &cmd->u.roamCmd.roamProfile; struct csr_roam_session *session; tSirBssDescription *bss_desc = NULL; struct tag_csrscan_result *scan_res = NULL; @@ -7745,7 +7746,7 @@ static bool csr_roam_process_results(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, struct csr_roam_info roam_info; uint32_t session_id = cmd->sessionId; struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id); - tCsrRoamProfile *profile = &cmd->u.roamCmd.roamProfile; + struct csr_roam_profile *profile = &cmd->u.roamCmd.roamProfile; eRoamCmdStatus roam_status; eCsrRoamResult roam_result; host_log_ibss_pkt_type *ibss_log; @@ -7910,8 +7911,8 @@ static bool csr_roam_process_results(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, * * Return: None */ -static void update_profile_fils_info(tCsrRoamProfile *des_profile, - tCsrRoamProfile *src_profile) +static void update_profile_fils_info(struct csr_roam_profile *des_profile, + struct csr_roam_profile *src_profile) { if (!src_profile || !src_profile->fils_con_info) return; @@ -7944,18 +7945,19 @@ static void update_profile_fils_info(tCsrRoamProfile *des_profile, des_profile->hlp_ie_len = src_profile->hlp_ie_len; } #else -static inline void update_profile_fils_info(tCsrRoamProfile *des_profile, - tCsrRoamProfile *src_profile) +static inline +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 pMac, - tCsrRoamProfile *pDstProfile, - tCsrRoamProfile *pSrcProfile) + struct csr_roam_profile *pDstProfile, + struct csr_roam_profile *pSrcProfile) { QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t size = 0; - qdf_mem_set(pDstProfile, sizeof(tCsrRoamProfile), 0); + qdf_mem_set(pDstProfile, sizeof(struct csr_roam_profile), 0); if (pSrcProfile->BSSIDs.numOfBSSIDs) { size = sizeof(struct qdf_mac_addr) * pSrcProfile->BSSIDs. numOfBSSIDs; @@ -8155,13 +8157,14 @@ end: } QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, - uint32_t sessionId, tCsrRoamProfile *pDstProfile) + uint32_t sessionId, + struct csr_roam_profile *pDstProfile) { QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamConnectedProfile *pSrcProfile = &pMac->roam.roamSession[sessionId].connectedProfile; - qdf_mem_set(pDstProfile, sizeof(tCsrRoamProfile), 0); + qdf_mem_set(pDstProfile, sizeof(struct csr_roam_profile), 0); pDstProfile->BSSIDs.bssid = qdf_mem_malloc(sizeof(struct qdf_mac_addr)); if (NULL == pDstProfile->BSSIDs.bssid) { @@ -8248,7 +8251,7 @@ end: } QDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tScanResultHandle hBSSList, enum csr_roam_reason reason, uint32_t roamId, bool fImediate, bool fClearScan) @@ -8311,7 +8314,7 @@ QDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, } QDF_STATUS csr_roam_issue_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tCsrRoamModifyProfileFields *pMmodProfileFields, enum csr_roam_reason reason, uint32_t roamId, @@ -8415,7 +8418,7 @@ QDF_STATUS csr_dequeue_roam_command(tpAniSirGlobal pMac, * * Return: true, if fils connection, false otherwise */ -static bool csr_is_fils_connection(tCsrRoamProfile *profile) +static bool csr_is_fils_connection(struct csr_roam_profile *profile) { if (!profile->fils_con_info) return false; @@ -8423,7 +8426,7 @@ static bool csr_is_fils_connection(tCsrRoamProfile *profile) return profile->fils_con_info->is_fils_connection; } #else -static bool csr_is_fils_connection(tCsrRoamProfile *pProfile) +static bool csr_is_fils_connection(struct csr_roam_profile *pProfile) { return false; } @@ -8459,7 +8462,7 @@ static void csr_roam_print_candidate_aps(tScanResultHandle results) } QDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, uint32_t *pRoamId) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -8684,7 +8687,7 @@ end: */ QDF_STATUS csr_roam_reassoc(tpAniSirGlobal mac_ctx, uint32_t session_id, - tCsrRoamProfile *profile, + struct csr_roam_profile *profile, tCsrRoamModifyProfileFields mod_fields, uint32_t *roam_id) { @@ -8758,7 +8761,7 @@ static QDF_STATUS csr_roam_join_last_profile(tpAniSirGlobal pMac, tScanResultHandle hBSSList = NULL; tCsrScanResultFilter *pScanFilter = NULL; uint32_t roamId; - tCsrRoamProfile *pProfile = NULL; + struct csr_roam_profile *pProfile = NULL; struct csr_roam_session *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { @@ -8771,7 +8774,7 @@ static QDF_STATUS csr_roam_join_last_profile(tpAniSirGlobal pMac, /* We have to make a copy of pCurRoamProfile because it * will be free inside csr_roam_issue_connect */ - pProfile = qdf_mem_malloc(sizeof(tCsrRoamProfile)); + pProfile = qdf_mem_malloc(sizeof(struct csr_roam_profile)); if (NULL == pProfile) { status = QDF_STATUS_E_NOMEM; goto end; @@ -9133,7 +9136,7 @@ QDF_STATUS csr_roam_disconnect(tpAniSirGlobal pMac, uint32_t sessionId, QDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes) { @@ -9437,7 +9440,7 @@ static void csr_roam_join_rsp_processor(tpAniSirGlobal pMac, static QDF_STATUS csr_roam_issue_join(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, uint32_t roamId) { QDF_STATUS status; @@ -9866,7 +9869,7 @@ static void csr_roam_roaming_state_stop_bss_rsp_processor(tpAniSirGlobal pMac, tSirSmeRsp *pSmeRsp) { enum csr_roamcomplete_result result_code = eCsrNothingToJoin; - tCsrRoamProfile *profile; + struct csr_roam_profile *profile; #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR { @@ -9959,7 +9962,7 @@ csr_post_roam_failure(tpAniSirGlobal mac_ctx, uint32_t session_id, struct csr_roam_info *roam_info, tCsrScanResultFilter *scan_filter, - tCsrRoamProfile *cur_roam_profile) + struct csr_roam_profile *cur_roam_profile) { QDF_STATUS status; @@ -10045,7 +10048,7 @@ void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal pMac, struct csr_roam_info *roamInfo; tCsrScanResultFilter *pScanFilter = NULL; uint32_t roamId = 0; - tCsrRoamProfile *pCurRoamProfile = NULL; + struct csr_roam_profile *pCurRoamProfile = NULL; QDF_STATUS status; uint32_t sessionId; struct csr_roam_session *pSession; @@ -10115,7 +10118,7 @@ void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal pMac, * Copy the connected profile to apply the same for this * connection as well */ - pCurRoamProfile = qdf_mem_malloc(sizeof(tCsrRoamProfile)); + pCurRoamProfile = qdf_mem_malloc(sizeof(*pCurRoamProfile)); if (pCurRoamProfile != NULL) { /* * notify sub-modules like QoS etc. that handoff @@ -10941,7 +10944,7 @@ csr_create_fils_realm_hash(struct cds_fils_connection_info *fils_con_info, * Return: None */ static void csr_update_fils_scan_filter(tCsrScanResultFilter *scan_fltr, - tCsrRoamProfile *profile) + struct csr_roam_profile *profile) { if (profile->fils_con_info && profile->fils_con_info->is_fils_connection) { @@ -10958,7 +10961,7 @@ static void csr_update_fils_scan_filter(tCsrScanResultFilter *scan_fltr, } #else static void csr_update_fils_scan_filter(tCsrScanResultFilter *scan_fltr, - tCsrRoamProfile *profile) + struct csr_roam_profile *profile) { } #endif @@ -10969,7 +10972,7 @@ static void csr_update_fils_scan_filter(tCsrScanResultFilter *scan_fltr, */ QDF_STATUS csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, - tCsrRoamProfile *profile, + struct csr_roam_profile *profile, tCsrScanResultFilter *scan_fltr) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -13063,7 +13066,7 @@ csr_compute_mode_and_band(tpAniSirGlobal mac_ctx, */ static enum csr_cfgdot11mode csr_roam_get_phy_mode_band_for_bss(tpAniSirGlobal mac_ctx, - tCsrRoamProfile *profile, + struct csr_roam_profile *profile, uint8_t opr_chn, enum band_info *p_band) { @@ -13386,7 +13389,7 @@ static bool csr_is_auth_in_list(tpAniSirGlobal pMac, tCsrAuthList *pAuthList, bool csr_is_same_profile(tpAniSirGlobal pMac, tCsrRoamConnectedProfile *pProfile1, - tCsrRoamProfile *pProfile2) + struct csr_roam_profile *pProfile2) { uint32_t i; bool fCheck = false; @@ -13442,7 +13445,7 @@ free_scan_filter: static bool csr_roam_is_same_profile_keys(tpAniSirGlobal pMac, tCsrRoamConnectedProfile *pConnProfile, - tCsrRoamProfile *pProfile2) + struct csr_roam_profile *pProfile2) { bool fCheck = false; int i; @@ -13684,7 +13687,7 @@ csr_convert_mode_to_nw_type(enum csr_cfgdot11mode dot11_mode, */ static void csr_populate_supported_rates_from_hostapd(tSirMacRateSet *opr_rates, tSirMacRateSet *ext_rates, - tCsrRoamProfile *profile) + struct csr_roam_profile *profile) { int i = 0; @@ -13733,7 +13736,7 @@ static void csr_populate_supported_rates_from_hostapd(tSirMacRateSet *opr_rates, */ static void csr_roam_get_bss_start_parms(tpAniSirGlobal pMac, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, struct csr_roamstart_bssparams *pParam, bool skip_hostapd_rate) { @@ -13927,7 +13930,7 @@ static void csr_roam_determine_max_rate_for_ad_hoc(tpAniSirGlobal pMac, QDF_STATUS csr_roam_issue_start_bss(tpAniSirGlobal pMac, uint32_t sessionId, struct csr_roamstart_bssparams *pParam, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tSirBssDescription *pBssDesc, uint32_t roamId) { @@ -14033,7 +14036,7 @@ QDF_STATUS csr_roam_issue_start_bss(tpAniSirGlobal pMac, uint32_t sessionId, } void csr_roam_prepare_bss_params(tpAniSirGlobal pMac, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tSirBssDescription *pBssDesc, struct bss_config_param *pBssConfig, tDot11fBeaconIEs *pIes) @@ -14103,7 +14106,7 @@ void csr_roam_prepare_bss_params(tpAniSirGlobal pMac, uint32_t sessionId, } static QDF_STATUS csr_roam_start_ibss(tpAniSirGlobal pMac, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, bool *pfSameIbss) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -14609,7 +14612,7 @@ eRoamCmdStatus csr_get_roam_complete_status(tpAniSirGlobal pMac, } static QDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tSirBssDescription *pBssDesc) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -14657,7 +14660,7 @@ static QDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId, /* Save profile for late use */ csr_free_roam_profile(pMac, sessionId); pSession->pCurRoamProfile = - qdf_mem_malloc(sizeof(tCsrRoamProfile)); + qdf_mem_malloc(sizeof(struct csr_roam_profile)); if (pSession->pCurRoamProfile != NULL) { csr_roam_copy_profile(pMac, pSession->pCurRoamProfile, @@ -14797,8 +14800,9 @@ bool csr_is_mfpc_capable(struct sDot11fIERSN *rsn) * * Return: void */ -static void csr_set_mgmt_enc_type(tCsrRoamProfile *profile, - tDot11fBeaconIEs *ies, tSirSmeJoinReq *csr_join_req) +static void csr_set_mgmt_enc_type(struct csr_roam_profile *profile, + tDot11fBeaconIEs *ies, + tSirSmeJoinReq *csr_join_req) { sme_debug("mgmt encryption type %d MFPe %d MFPr %d", profile->mgmt_encryption_type, @@ -14816,8 +14820,9 @@ static void csr_set_mgmt_enc_type(tCsrRoamProfile *profile, csr_join_req->MgmtEncryptionType = eSIR_ED_NONE; } #else -static inline void csr_set_mgmt_enc_type(tCsrRoamProfile *profile, - tDot11fBeaconIEs *pIes, tSirSmeJoinReq *csr_join_req) +static inline void csr_set_mgmt_enc_type(struct csr_roam_profile *profile, + tDot11fBeaconIEs *pIes, + tSirSmeJoinReq *csr_join_req) { } #endif @@ -14830,8 +14835,8 @@ static inline void csr_set_mgmt_enc_type(tCsrRoamProfile *profile, * * Return: None */ -static void csr_update_fils_connection_info(tCsrRoamProfile *profile, - tSirSmeJoinReq *csr_join_req) +static void csr_update_fils_connection_info(struct csr_roam_profile *profile, + tSirSmeJoinReq *csr_join_req) { if (!profile->fils_con_info) return; @@ -14846,8 +14851,8 @@ static void csr_update_fils_connection_info(tCsrRoamProfile *profile, } } #else -static void csr_update_fils_connection_info(tCsrRoamProfile *profile, - tSirSmeJoinReq *csr_join_req) +static void csr_update_fils_connection_info(struct csr_roam_profile *profile, + tSirSmeJoinReq *csr_join_req) { } #endif @@ -14894,7 +14899,7 @@ static void csr_update_sae_config(tSirSmeJoinReq *csr_join_req, */ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pBssDescription, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tDot11fBeaconIEs *pIes, uint16_t messageType) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -18834,10 +18839,10 @@ 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, - tCsrRoamProfile *src_profile) + struct csr_roam_profile *src_profile) { struct csr_roam_session *session = CSR_GET_SESSION(mac, session_id); - tCsrRoamProfile *dst_profile = NULL; + struct csr_roam_profile *dst_profile = NULL; if (!session) { sme_err("session NULL"); @@ -19979,7 +19984,7 @@ QDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, struct qdf_mac_addr bssid, struct ch_params *ch_params, - tCsrRoamProfile *profile) + struct csr_roam_profile *profile) { QDF_STATUS status = QDF_STATUS_SUCCESS; tSirChanChangeRequest *pMsg; @@ -20614,7 +20619,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, - tCsrRoamProfile *profile, + struct csr_roam_profile *profile, tScanResultHandle scan_cache, uint32_t *roam_id, uint32_t session_id) diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index 5f3c56273166..a1d4aa13c7f3 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -936,7 +936,7 @@ QDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal mac_ctx, QDF_STATUS status = QDF_STATUS_E_FAILURE; tScanResultHandle hBSSList = CSR_INVALID_SCANRESULT_HANDLE; tCsrScanResultFilter *pScanFilter = NULL; - tCsrRoamProfile *profile; + struct csr_roam_profile *profile; struct csr_roam_session *session; session = CSR_GET_SESSION(mac_ctx, session_id); @@ -1008,9 +1008,9 @@ QDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal mac_ctx, * Return: true for FILS connection else false */ #ifdef WLAN_FEATURE_FILS_SK -static -bool csr_handle_fils_scan_for_ssid_failure(tCsrRoamProfile *roam_profile, - struct csr_roam_info *roam_info) +static bool +csr_handle_fils_scan_for_ssid_failure(struct csr_roam_profile *roam_profile, + struct csr_roam_info *roam_info) { if (roam_profile && roam_profile->fils_con_info && roam_profile->fils_con_info->is_fils_connection) { @@ -1025,9 +1025,9 @@ bool csr_handle_fils_scan_for_ssid_failure(tCsrRoamProfile *roam_profile, return false; } #else -static -bool csr_handle_fils_scan_for_ssid_failure(tCsrRoamProfile *roam_profile, - struct csr_roam_info *roam_info) +static bool +csr_handle_fils_scan_for_ssid_failure(struct csr_roam_profile *roam_profile, + struct csr_roam_info *roam_info) { return false; } @@ -1037,7 +1037,7 @@ QDF_STATUS csr_scan_handle_search_for_ssid_failure(tpAniSirGlobal mac_ctx, uint32_t session_id) { QDF_STATUS status = QDF_STATUS_SUCCESS; - tCsrRoamProfile *profile; + struct csr_roam_profile *profile; struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id); eCsrRoamResult roam_result; struct csr_roam_info *roam_info = NULL; @@ -2242,7 +2242,7 @@ QDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal pMac, /** * csr_scan_for_ssid() - Function usually used for BSSs that suppresses SSID * @mac_ctx: Pointer to Global Mac structure - * @profile: pointer to tCsrRoamProfile + * @profile: pointer to struct csr_roam_profile * @roam_id: variable representing roam id * @notify: boolean variable * @@ -2252,7 +2252,7 @@ QDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal pMac, * Return: Success - QDF_STATUS_SUCCESS, Failure - error number */ QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, - tCsrRoamProfile *profile, uint32_t roam_id, + struct csr_roam_profile *profile, uint32_t roam_id, bool notify) { QDF_STATUS status = QDF_STATUS_E_INVAL; @@ -2276,7 +2276,7 @@ QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, } session->scan_info.profile = - qdf_mem_malloc(sizeof(tCsrRoamProfile)); + qdf_mem_malloc(sizeof(struct csr_roam_profile)); if (!session->scan_info.profile) status = QDF_STATUS_E_NOMEM; else diff --git a/core/sme/src/csr/csr_host_scan_roam.c b/core/sme/src/csr/csr_host_scan_roam.c index 48bd59cbc221..e7591bc42892 100644 --- a/core/sme/src/csr/csr_host_scan_roam.c +++ b/core/sme/src/csr/csr_host_scan_roam.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -48,7 +48,7 @@ */ QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pSirBssDesc, - tDot11fBeaconIEs *pIes, tCsrRoamProfile *pProfile) + tDot11fBeaconIEs *pIes, struct csr_roam_profile *pProfile) { csr_roam_state_change(pMac, eCSR_ROAMING_STATE_JOINING, sessionId); /* Set the roaming substate to 'join attempt'... */ diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h index dc340fde7314..d1bb6e71ae5a 100644 --- a/core/sme/src/csr/csr_inside_api.h +++ b/core/sme/src/csr/csr_inside_api.h @@ -237,13 +237,14 @@ bool csr_is_network_type_equal(tSirBssDescription *pSirBssDesc1, * Upon successful return, caller MUST call csr_free_scan_filter on * pScanFilter when it is done with the filter. */ -QDF_STATUS csr_roam_prepare_filter_from_profile(tpAniSirGlobal pMac, - tCsrRoamProfile *pProfile, - tCsrScanResultFilter - *pScanFilter); +QDF_STATUS +csr_roam_prepare_filter_from_profile(tpAniSirGlobal pMac, + struct csr_roam_profile *pProfile, + tCsrScanResultFilter *pScanFilter); + QDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, - tCsrRoamProfile *pDstProfile, - tCsrRoamProfile *pSrcProfile); + struct csr_roam_profile *pDstProfile, + struct csr_roam_profile *pSrcProfile); QDF_STATUS csr_roam_start(tpAniSirGlobal pMac); void csr_roam_stop(tpAniSirGlobal pMac, uint32_t sessionId); void csr_roam_startMICFailureTimer(tpAniSirGlobal pMac); @@ -256,7 +257,7 @@ QDF_STATUS csr_scan_close(tpAniSirGlobal pMac); bool csr_scan_append_bss_description(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDescription); QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal pMac, uint32_t sessionId, - tCsrRoamProfile *pProfile, uint32_t roamId, + struct csr_roam_profile *pProfile, uint32_t roamId, bool notify); /** * csr_scan_abort_mac_scan() - Generic API to abort scan request @@ -289,12 +290,12 @@ QDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t roamId, eRoamCmdStatus u1, eCsrRoamResult u2); QDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, - tCsrRoamProfile *pProfile, + 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 pMac, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tCsrRoamModifyProfileFields *pModProfileFields, enum csr_roam_reason reason, uint32_t roamId, bool fImediate); @@ -314,7 +315,7 @@ QDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal pMac, bool fDisassoc, bool fMICFailure); QDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes); void csr_roam_check_for_link_status_change(tpAniSirGlobal pMac, @@ -322,13 +323,13 @@ void csr_roam_check_for_link_status_change(tpAniSirGlobal pMac, void csr_roam_stats_rsp_processor(tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg); QDF_STATUS csr_roam_issue_start_bss(tpAniSirGlobal pMac, uint32_t sessionId, struct csr_roamstart_bssparams *pParam, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tSirBssDescription *pBssDesc, uint32_t roamId); QDF_STATUS csr_roam_issue_stop_bss(tpAniSirGlobal pMac, uint32_t sessionId, enum csr_roam_substate NewSubstate); bool csr_is_same_profile(tpAniSirGlobal pMac, tCsrRoamConnectedProfile - *pProfile1, tCsrRoamProfile *pProfile2); + *pProfile1, struct csr_roam_profile *pProfile2); bool csr_is_roam_command_waiting(tpAniSirGlobal pMac); bool csr_is_roam_command_waiting_for_session(tpAniSirGlobal pMac, uint32_t sessionId); @@ -347,7 +348,7 @@ void csr_roam_remove_duplicate_command(tpAniSirGlobal pMac, uint32_t sessionId, QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pBssDescription, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tDot11fBeaconIEs *pIes, uint16_t messageType); QDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, tSirMacAddr bssId, uint16_t reasonCode); @@ -380,7 +381,7 @@ bool csr_is_ssid_match(tpAniSirGlobal pMac, uint8_t *ssid1, uint8_t ssid1Len, bool fSsidRequired); bool csr_is_phy_mode_match(tpAniSirGlobal pMac, uint32_t phyMode, tSirBssDescription *pSirBssDesc, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, enum csr_cfgdot11mode *pReturnCfgDot11Mode, tDot11fBeaconIEs *pIes); bool csr_roam_is_channel_valid(tpAniSirGlobal pMac, uint8_t channel); @@ -403,14 +404,18 @@ bool csr_check_ps_ready(void *pv); bool csr_check_ps_offload_ready(void *pv, uint32_t sessionId); /* to free memory allocated inside the profile structure */ -void csr_release_profile(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile); +void csr_release_profile(tpAniSirGlobal pMac, + struct csr_roam_profile *pProfile); + /* To free memory allocated inside scanFilter */ void csr_free_scan_filter(tpAniSirGlobal pMac, tCsrScanResultFilter *pScanFilter); -enum csr_cfgdot11mode csr_get_cfg_dot11_mode_from_csr_phy_mode(tCsrRoamProfile - *pProfile, - eCsrPhyMode phyMode, - bool fProprietary); + +enum csr_cfgdot11mode +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 pMac, enum csr_cfgdot11mode csrDot11Mode); void csr_save_channel_power_for_band(tpAniSirGlobal pMac, bool fPopulate5GBand); @@ -572,7 +577,7 @@ void csr_scan_flush_bss_entry(tpAniSirGlobal pMac, tpSmeCsaOffloadInd pCsaOffloadInd); #ifdef FEATURE_WLAN_WAPI -bool csr_is_profile_wapi(tCsrRoamProfile *pProfile); +bool csr_is_profile_wapi(struct csr_roam_profile *pProfile); #endif /* FEATURE_WLAN_WAPI */ void csr_get_vdev_type_nss(tpAniSirGlobal mac_ctx, @@ -681,7 +686,7 @@ QDF_STATUS csr_scan_result_purge(tpAniSirGlobal pMac, * Return QDF_STATUS */ QDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, uint32_t *pRoamId); /* @@ -697,7 +702,7 @@ QDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, * Return QDF_STATUS */ QDF_STATUS csr_roam_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tCsrRoamModifyProfileFields modProfileFields, uint32_t *pRoamId); @@ -991,11 +996,15 @@ bool is_disconnect_pending(tpAniSirGlobal mac_ctx, void csr_scan_active_list_timeout_handle(void *userData); QDF_STATUS csr_prepare_disconnect_command(tpAniSirGlobal mac, uint32_t session_id, tSmeCmd **sme_cmd); -QDF_STATUS csr_roam_prepare_bss_config_from_profile(tpAniSirGlobal mac_ctx, - tCsrRoamProfile *profile, struct bss_config_param *bss_cfg, - tSirBssDescription *bss_desc); + +QDF_STATUS +csr_roam_prepare_bss_config_from_profile(tpAniSirGlobal 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, - tCsrRoamProfile *profile, tSirBssDescription *bss_desc, + struct csr_roam_profile *profile, tSirBssDescription *bss_desc, struct bss_config_param *bss_cfg, tDot11fBeaconIEs *ies); /** @@ -1013,7 +1022,7 @@ void csr_remove_bssid_from_scan_list(tpAniSirGlobal mac_ctx, QDF_STATUS csr_roam_set_bss_config_cfg(tpAniSirGlobal mac_ctx, uint32_t session_id, - tCsrRoamProfile *profile, tSirBssDescription *bss_desc, + 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 pMac, diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index 3e8b2f536f3c..408c749869a5 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -1484,7 +1484,7 @@ static QDF_STATUS csr_neighbor_roam_process_handoff_req( &mac_ctx->roam.neighborRoamInfo[session_id]; QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t roam_id; - tCsrRoamProfile *profile = NULL; + struct csr_roam_profile *profile = NULL; struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id); uint8_t i = 0; uint8_t roam_now = 0; @@ -1498,7 +1498,7 @@ static QDF_STATUS csr_neighbor_roam_process_handoff_req( } roam_id = GET_NEXT_ROAM_ID(&mac_ctx->roam); - profile = qdf_mem_malloc(sizeof(tCsrRoamProfile)); + profile = qdf_mem_malloc(sizeof(struct csr_roam_profile)); if (NULL == profile) { sme_err("Memory alloc failed"); return QDF_STATUS_E_NOMEM; diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 77314472fab4..07a45f4064fe 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -2056,7 +2056,7 @@ static bool csr_get_phy_mode_in_use(eCsrPhyMode phyModeIn, */ bool csr_is_phy_mode_match(tpAniSirGlobal pMac, uint32_t phyMode, tSirBssDescription *pSirBssDesc, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, enum csr_cfgdot11mode *pReturnCfgDot11Mode, tDot11fBeaconIEs *pIes) { @@ -2212,7 +2212,7 @@ uint32_t csr_get11h_power_constraint(tHalHandle hHal, return localPowerConstraint; } -bool csr_is_profile_wpa(tCsrRoamProfile *pProfile) +bool csr_is_profile_wpa(struct csr_roam_profile *pProfile) { bool fWpaProfile = false; @@ -2248,7 +2248,7 @@ bool csr_is_profile_wpa(tCsrRoamProfile *pProfile) return fWpaProfile; } -bool csr_is_profile_rsn(tCsrRoamProfile *pProfile) +bool csr_is_profile_rsn(struct csr_roam_profile *pProfile) { bool fRSNProfile = false; @@ -2723,7 +2723,7 @@ bool csr_is_auth_type11r(eCsrAuthType auth_type, uint8_t mdie_present) } /* Function to return true if the profile is 11r */ -bool csr_is_profile11r(tCsrRoamProfile *pProfile) +bool csr_is_profile11r(struct csr_roam_profile *pProfile) { return csr_is_auth_type11r(pProfile->negotiatedAuthType, pProfile->MDID.mdiePresent); @@ -2744,7 +2744,7 @@ bool csr_is_auth_type_ese(eCsrAuthType AuthType) #ifdef FEATURE_WLAN_ESE /* Function to return true if the profile is ESE */ -bool csr_is_profile_ese(tCsrRoamProfile *pProfile) +bool csr_is_profile_ese(struct csr_roam_profile *pProfile) { return csr_is_auth_type_ese(pProfile->negotiatedAuthType); } @@ -2752,7 +2752,7 @@ bool csr_is_profile_ese(tCsrRoamProfile *pProfile) #endif #ifdef FEATURE_WLAN_WAPI -bool csr_is_profile_wapi(tCsrRoamProfile *pProfile) +bool csr_is_profile_wapi(struct csr_roam_profile *pProfile) { bool fWapiProfile = false; @@ -3809,7 +3809,7 @@ static bool csr_lookup_pmkid(tpAniSirGlobal pMac, uint32_t sessionId, * Return: true if cache identifier present else false */ static bool csr_update_pmksa_for_cache_id(tSirBssDescription *bss_desc, - tCsrRoamProfile *profile, + struct csr_roam_profile *profile, tPmkidCacheInfo *pmkid_cache) { if (!bss_desc->fils_info_element.is_cache_id_present) @@ -3838,8 +3838,8 @@ static bool csr_update_pmksa_for_cache_id(tSirBssDescription *bss_desc, * * Return: None */ -static inline void csr_update_pmksa_to_profile(tCsrRoamProfile *profile, - tPmkidCacheInfo *pmkid_cache) +static inline void csr_update_pmksa_to_profile(struct csr_roam_profile *profile, + tPmkidCacheInfo *pmkid_cache) { if (!profile->fils_con_info) return; @@ -3853,20 +3853,20 @@ static inline void csr_update_pmksa_to_profile(tCsrRoamProfile *profile, } #else static inline bool csr_update_pmksa_for_cache_id(tSirBssDescription *bss_desc, - tCsrRoamProfile *profile, + struct csr_roam_profile *profile, tPmkidCacheInfo *pmkid_cache) { return false; } -static inline void csr_update_pmksa_to_profile(tCsrRoamProfile *profile, - tPmkidCacheInfo *pmkid_cache) +static inline void csr_update_pmksa_to_profile(struct csr_roam_profile *profile, + tPmkidCacheInfo *pmkid_cache) { } #endif uint8_t csr_construct_rsn_ie(tHalHandle hHal, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrRSNIe *pRSNIe) { @@ -4243,7 +4243,7 @@ static bool csr_lookup_bkid(tpAniSirGlobal pMac, uint32_t sessionId, } uint8_t csr_construct_wapi_ie(tpAniSirGlobal pMac, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe) { @@ -4518,7 +4518,7 @@ static bool csr_is_wpa_encryption_match(tpAniSirGlobal pMac, return fWpaMatch; } -uint8_t csr_construct_wpa_ie(tHalHandle hHal, tCsrRoamProfile *pProfile, +uint8_t csr_construct_wpa_ie(tHalHandle hHal, struct csr_roam_profile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrWpaIe *pWpaIe) { @@ -4604,7 +4604,7 @@ uint8_t csr_construct_wpa_ie(tHalHandle hHal, tCsrRoamProfile *pProfile, * 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(tHalHandle hHal, tCsrRoamProfile *pProfile, +uint8_t csr_retrieve_wpa_ie(tHalHandle hHal, struct csr_roam_profile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrWpaIe *pWpaIe) { @@ -4636,7 +4636,7 @@ uint8_t csr_retrieve_wpa_ie(tHalHandle hHal, tCsrRoamProfile *pProfile, * it can contain a max length WPA IE */ uint8_t csr_retrieve_rsn_ie(tHalHandle hHal, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrRSNIe *pRsnIe) { @@ -4695,7 +4695,7 @@ uint8_t csr_retrieve_rsn_ie(tHalHandle hHal, uint32_t sessionId, * it can contain a max length WAPI IE */ uint8_t csr_retrieve_wapi_ie(tHalHandle hHal, uint32_t sessionId, - tCsrRoamProfile *pProfile, + struct csr_roam_profile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe) { @@ -5746,7 +5746,7 @@ uint16_t csr_rates_find_best_rate(tSirMacRateSet *pSuppRates, } #ifdef WLAN_FEATURE_FILS_SK -static inline void csr_free_fils_profile_info(tCsrRoamProfile *profile) +static inline void csr_free_fils_profile_info(struct csr_roam_profile *profile) { if (profile->fils_con_info) { qdf_mem_free(profile->fils_con_info); @@ -5760,11 +5760,11 @@ static inline void csr_free_fils_profile_info(tCsrRoamProfile *profile) } } #else -static inline void csr_free_fils_profile_info(tCsrRoamProfile *profile) +static inline void csr_free_fils_profile_info(struct csr_roam_profile *profile) { } #endif -void csr_release_profile(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile) +void csr_release_profile(tpAniSirGlobal pMac, struct csr_roam_profile *pProfile) { if (pProfile) { if (pProfile->BSSIDs.bssid) { @@ -5804,7 +5804,7 @@ void csr_release_profile(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile) pProfile->ChannelInfo.ChannelList = NULL; } csr_free_fils_profile_info(pProfile); - qdf_mem_set(pProfile, sizeof(tCsrRoamProfile), 0); + qdf_mem_set(pProfile, sizeof(struct csr_roam_profile), 0); } } @@ -5929,10 +5929,10 @@ tSirBssType csr_translate_bsstype_to_mac_type(eCsrRoamBssType csrtype) /* This function use the parameters to decide the CFG value. */ /* CSR never sets WNI_CFG_DOT11_MODE_ALL to the CFG */ /* So PE should not see WNI_CFG_DOT11_MODE_ALL when it gets the CFG value */ -enum csr_cfgdot11mode csr_get_cfg_dot11_mode_from_csr_phy_mode(tCsrRoamProfile - *pProfile, - eCsrPhyMode phyMode, - bool fProprietary) +enum csr_cfgdot11mode +csr_get_cfg_dot11_mode_from_csr_phy_mode(struct csr_roam_profile *pProfile, + eCsrPhyMode phyMode, + bool fProprietary) { uint32_t cfgDot11Mode = eCSR_CFG_DOT11_MODE_ABG; diff --git a/core/sme/src/nan/nan_datapath_api.c b/core/sme/src/nan/nan_datapath_api.c index ea6bf7e4be06..e6374f5f8dd9 100644 --- a/core/sme/src/nan/nan_datapath_api.c +++ b/core/sme/src/nan/nan_datapath_api.c @@ -39,7 +39,7 @@ * Return: Success or failure code */ QDF_STATUS csr_roam_start_ndi(tpAniSirGlobal mac_ctx, uint32_t session, - tCsrRoamProfile *profile) + struct csr_roam_profile *profile) { QDF_STATUS status; struct bss_config_param bss_cfg = {0}; @@ -79,7 +79,7 @@ QDF_STATUS csr_roam_start_ndi(tpAniSirGlobal mac_ctx, uint32_t session, */ void csr_roam_save_ndi_connected_info(tpAniSirGlobal mac_ctx, uint32_t session_id, - tCsrRoamProfile *roam_profile, + struct csr_roam_profile *roam_profile, tSirBssDescription *bssdesc) { struct csr_roam_session *roam_session = NULL;