From 9aedc72f0862b6663502eea1c69bba2c85923eb1 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Thu, 22 Nov 2018 13:44:01 -0800 Subject: [PATCH] qcacld-3.0: Rename pMac in csr misc files Per the Linux coding style "mixed-case names are frowned upon" and "so-called Hungarian notation [...] is brain damaged." One identifier used extensively throughout the driver that violates both of these tenants is "pMac." In order to be compliant with the Linux coding style there is a campaign to rename all instances of this identifier. For this change rename all instances of "pMac" to "mac" in: csr_api.h csr_support.h csr_host_scan_roam.c csr_roam_preauth.c Change-Id: I941c87e308f47162e9eddd111498cf072dbcdf81 CRs-Fixed: 2355449 --- core/sme/inc/csr_api.h | 8 +-- core/sme/inc/csr_support.h | 20 +++---- core/sme/src/csr/csr_host_scan_roam.c | 86 +++++++++++++-------------- core/sme/src/csr/csr_roam_preauth.c | 6 +- 4 files changed, 60 insertions(+), 60 deletions(-) diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index 0d7be5edf5ecb..df5e94a8e80d2 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -1194,11 +1194,11 @@ typedef struct tagCsrUpdateConfigParam { tCsr11dinfo Csr11dinfo; } tCsrUpdateConfigParam; #ifdef WLAN_FEATURE_ROAM_OFFLOAD -#define csr_roamIsRoamOffloadEnabled(pMac) \ - (pMac->mlme_cfg->lfr.lfr3_roaming_offload) +#define csr_roamIsRoamOffloadEnabled(mac) \ + (mac->mlme_cfg->lfr.lfr3_roaming_offload) #define DEFAULT_REASSOC_FAILURE_TIMEOUT 1000 #else -#define csr_roamIsRoamOffloadEnabled(pMac) false +#define csr_roamIsRoamOffloadEnabled(mac) false #endif #ifdef WLAN_FEATURE_ROAM_OFFLOAD @@ -1580,7 +1580,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 pMac, tCsrConfigParam *pParam); +QDF_STATUS csr_set_channels(tpAniSirGlobal mac, tCsrConfigParam *pParam); /* enum to string conversion for debug output */ const char *get_e_roam_cmd_status_str(eRoamCmdStatus val); diff --git a/core/sme/inc/csr_support.h b/core/sme/inc/csr_support.h index a1dccf416636a..b08597fe9ecb3 100644 --- a/core/sme/inc/csr_support.h +++ b/core/sme/inc/csr_support.h @@ -234,12 +234,12 @@ uint32_t csr_get_rts_thresh(tpAniSirGlobal mac_ctx); eCsrPhyMode csr_get_phy_mode_from_bssDesc(tSirBssDescription *pSirBssDesc); uint32_t csr_get11h_power_constraint(tpAniSirGlobal mac_ctx, tDot11fIEPowerConstraints *constraints); -uint8_t csr_construct_rsn_ie(tpAniSirGlobal pMac, uint32_t sessionId, +uint8_t csr_construct_rsn_ie(tpAniSirGlobal mac, uint32_t sessionId, struct csr_roam_profile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrRSNIe *pRSNIe); -uint8_t csr_construct_wpa_ie(tpAniSirGlobal pMac, uint8_t session_id, +uint8_t csr_construct_wpa_ie(tpAniSirGlobal 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 pMac, uint8_t session_id, +uint8_t csr_retrieve_wpa_ie(tpAniSirGlobal mac, uint8_t session_id, struct csr_roam_profile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrWpaIe *pWpaIe); -bool csr_is_ssid_equal(tpAniSirGlobal pMac, +bool csr_is_ssid_equal(tpAniSirGlobal 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 pMac, uint32_t sessionId, +uint8_t csr_retrieve_rsn_ie(tpAniSirGlobal 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 pMac, 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 pMac, uint32_t sessionId, +uint8_t csr_retrieve_wapi_ie(tpAniSirGlobal mac, uint32_t sessionId, struct csr_roam_profile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe); @@ -323,9 +323,9 @@ QDF_STATUS csr_get_parsed_bss_description_ies(tpAniSirGlobal mac_ctx, tSirBssDescription *pBssDesc, tDot11fBeaconIEs **ppIEStruct); -tSirScanType csr_get_scan_type(tpAniSirGlobal pMac, uint8_t chnId); +tSirScanType csr_get_scan_type(tpAniSirGlobal mac, uint8_t chnId); uint8_t csr_to_upper(uint8_t ch); -QDF_STATUS csr_get_phy_mode_from_bss(tpAniSirGlobal pMac, +QDF_STATUS csr_get_phy_mode_from_bss(tpAniSirGlobal mac, tSirBssDescription *pBSSDescription, eCsrPhyMode *pPhyMode, tDot11fBeaconIEs *pIes); /* @@ -335,12 +335,12 @@ QDF_STATUS csr_get_phy_mode_from_bss(tpAniSirGlobal pMac, * the user wants. There may be discrepency in it. UAPSD-bypass logic should * decide if it needs to reassoc */ -QDF_STATUS csr_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_reassoc(tpAniSirGlobal mac, uint32_t sessionId, tCsrRoamModifyProfileFields *pModProfileFields, uint32_t *pRoamId, bool fForce); /* BeaconInterval validation for MCC support */ -QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, uint8_t channelId, +QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal 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); diff --git a/core/sme/src/csr/csr_host_scan_roam.c b/core/sme/src/csr/csr_host_scan_roam.c index 79d419e677192..4f6475d79e62d 100644 --- a/core/sme/src/csr/csr_host_scan_roam.c +++ b/core/sme/src/csr/csr_host_scan_roam.c @@ -36,7 +36,7 @@ /** * csr_roam_issue_reassociate() - Issue Reassociate - * @pMac: Global MAC Context + * @mac: Global MAC Context * @sessionId: SME Session ID * @pSirBssDesc: BSS Descriptor * @pIes: Pointer to the IE's @@ -44,29 +44,29 @@ * * Return: Success or Failure */ -QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal mac, uint32_t sessionId, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, struct csr_roam_profile *pProfile) { - csr_roam_state_change(pMac, eCSR_ROAMING_STATE_JOINING, sessionId); + csr_roam_state_change(mac, eCSR_ROAMING_STATE_JOINING, sessionId); /* Set the roaming substate to 'join attempt'... */ - csr_roam_substate_change(pMac, eCSR_ROAM_SUBSTATE_REASSOC_REQ, + csr_roam_substate_change(mac, eCSR_ROAM_SUBSTATE_REASSOC_REQ, sessionId); QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL(" calling csr_send_join_req_msg (eWNI_SME_REASSOC_REQ)")); /* attempt to Join this BSS... */ - return csr_send_join_req_msg(pMac, sessionId, pSirBssDesc, pProfile, + return csr_send_join_req_msg(mac, sessionId, pSirBssDesc, pProfile, pIes, eWNI_SME_REASSOC_REQ); } /** * csr_roam_issue_reassociate_cmd() - Issue the reassociate command - * @pMac: Global MAC Context + * @mac: Global MAC Context * @sessionId: SME Session ID * * Return: Success or Failure status */ -QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal mac, uint32_t sessionId) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -76,7 +76,7 @@ QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, tListElem *pEntry; tSmeCmd *tmp_command; - pEntry = csr_nonscan_active_ll_peek_head(pMac, LL_ACCESS_LOCK); + pEntry = csr_nonscan_active_ll_peek_head(mac, LL_ACCESS_LOCK); if (pEntry) { pCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link); if (!pCommand) { @@ -87,7 +87,7 @@ QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, if (pCommand->u.roamCmd.roamReason == eCsrSmeIssuedAssocToSimilarAP) fRemoveCmd = - csr_nonscan_active_ll_remove_entry(pMac, + csr_nonscan_active_ll_remove_entry(mac, pEntry, LL_ACCESS_LOCK); else @@ -107,10 +107,10 @@ QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, * roam profile. Or those info will be freed in function * csr_reinit_roam_cmd when releasing the current command. */ - tmp_command = csr_get_command_buffer(pMac); + tmp_command = csr_get_command_buffer(mac); if (tmp_command == NULL) { sme_err("fail to get cmd buf!"); - csr_release_command(pMac, pCommand); + csr_release_command(mac, pCommand); return QDF_STATUS_E_RESOURCES; } qdf_mem_copy(tmp_command, pCommand, sizeof(*pCommand)); @@ -123,19 +123,19 @@ QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, * Because the API csr_nonscan_active_ll_remove_entry does * not remove the current command from active queue. */ - csr_release_command(pMac, pCommand); + csr_release_command(mac, pCommand); pCommand = tmp_command; /* Change the substate in case it is wait-for-key */ - if (CSR_IS_WAIT_FOR_KEY(pMac, sessionId)) { - csr_roam_stop_wait_for_key_timer(pMac); - csr_roam_substate_change(pMac, eCSR_ROAM_SUBSTATE_NONE, + if (CSR_IS_WAIT_FOR_KEY(mac, sessionId)) { + csr_roam_stop_wait_for_key_timer(mac); + csr_roam_substate_change(mac, eCSR_ROAM_SUBSTATE_NONE, sessionId); } pCommand->command = eSmeCommandRoam; pCommand->sessionId = (uint8_t) sessionId; pCommand->u.roamCmd.roamReason = eCsrSmeIssuedFTReassoc; - status = csr_queue_sme_command(pMac, pCommand, fHighPriority); + status = csr_queue_sme_command(mac, pCommand, fHighPriority); if (!QDF_IS_STATUS_SUCCESS(status)) sme_err("fail to send message status: %d", status); } while (0); @@ -393,22 +393,22 @@ void csr_neighbor_roam_trigger_handoff(tpAniSirGlobal mac_ctx, /** * csr_neighbor_roam_process_scan_complete() - Post process the scan results - * @pMac: Global MAC Context + * @mac: Global MAC Context * @sessionId: SME Session ID * * Return: Success or Failure */ -QDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal mac, uint8_t sessionId) { tpCsrNeighborRoamControlInfo pNeighborRoamInfo = - &pMac->roam.neighborRoamInfo[sessionId]; + &mac->roam.neighborRoamInfo[sessionId]; tCsrScanResultFilter scanFilter; tScanResultHandle scanResult; uint32_t tempVal = 0; QDF_STATUS hstatus; - hstatus = csr_neighbor_roam_prepare_scan_profile_filter(pMac, + hstatus = csr_neighbor_roam_prepare_scan_profile_filter(mac, &scanFilter, sessionId); sme_debug("Prepare scan to find neighbor AP filter status: %d", @@ -418,25 +418,25 @@ QDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, tempVal); return QDF_STATUS_E_FAILURE; } - hstatus = csr_scan_get_result(pMac, &scanFilter, &scanResult); + hstatus = csr_scan_get_result(mac, &scanFilter, &scanResult); if (hstatus != QDF_STATUS_SUCCESS) sme_err("Get Scan Result status code %d", hstatus); /* Process the scan results and update roamable AP list */ - csr_neighbor_roam_process_scan_results(pMac, sessionId, &scanResult); + csr_neighbor_roam_process_scan_results(mac, sessionId, &scanResult); /* Free the scan filter */ - csr_free_scan_filter(pMac, &scanFilter); + csr_free_scan_filter(mac, &scanFilter); tempVal = csr_ll_count(&pNeighborRoamInfo->roamableAPList); if (tempVal) { - csr_neighbor_roam_trigger_handoff(pMac, sessionId); + csr_neighbor_roam_trigger_handoff(mac, sessionId); return QDF_STATUS_SUCCESS; } - if (csr_roam_is_roam_offload_scan_enabled(pMac)) { + if (csr_roam_is_roam_offload_scan_enabled(mac)) { if (pNeighborRoamInfo->uOsRequestedHandoff) { - csr_roam_offload_scan(pMac, sessionId, + csr_roam_offload_scan(mac, sessionId, ROAM_SCAN_OFFLOAD_START, REASON_NO_CAND_FOUND_OR_NOT_ROAMING_NOW); pNeighborRoamInfo->uOsRequestedHandoff = 0; @@ -444,11 +444,11 @@ QDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, /* There is no candidate or We are not roaming Now. * Inform the FW to restart Roam Offload Scan */ - csr_roam_offload_scan(pMac, sessionId, + csr_roam_offload_scan(mac, sessionId, ROAM_SCAN_OFFLOAD_RESTART, REASON_NO_CAND_FOUND_OR_NOT_ROAMING_NOW); } - csr_neighbor_roam_state_transition(pMac, + csr_neighbor_roam_state_transition(mac, eCSR_NEIGHBOR_ROAM_STATE_CONNECTED, sessionId); } return QDF_STATUS_SUCCESS; @@ -466,14 +466,14 @@ QDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, * * Return: QDF_STATUS_SUCCESS on success, corresponding error code otherwise */ -QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal mac, void *pMsg) { tSirSmeCandidateFoundInd *pSirSmeCandidateFoundInd = (tSirSmeCandidateFoundInd *) pMsg; uint32_t sessionId = pSirSmeCandidateFoundInd->sessionId; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = - &pMac->roam.neighborRoamInfo[sessionId]; + &mac->roam.neighborRoamInfo[sessionId]; QDF_STATUS status = QDF_STATUS_SUCCESS; sme_debug("Received indication from firmware"); @@ -491,7 +491,7 @@ QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, * Age out older entries so that new candidate beacons * will get preference. */ - status = csr_neighbor_roam_process_scan_complete(pMac, + status = csr_neighbor_roam_process_scan_complete(mac, sessionId); if (QDF_STATUS_SUCCESS != status) { sme_err("scan process complete failed, status %d", @@ -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 pMac, +bool csr_neighbor_roam_remove_roamable_ap_list_entry(tpAniSirGlobal mac, tDblLinkList *pList, tpCsrNeighborRoamBSSInfo pNeighborEntry) @@ -691,7 +691,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, /** * csr_neighbor_roam_get_handoff_ap_info - Identifies the best AP for roaming * - * @pMac: mac context + * @mac: mac context * @session_id: Session Id * @hand_off_node: AP node that is the handoff candidate returned * @@ -702,12 +702,12 @@ 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 pMac, +bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal mac, tpCsrNeighborRoamBSSInfo hand_off_node, uint8_t session_id) { tpCsrNeighborRoamControlInfo ngbr_roam_info = - &pMac->roam.neighborRoamInfo[session_id]; + &mac->roam.neighborRoamInfo[session_id]; tpCsrNeighborRoamBSSInfo bss_node = NULL; if (NULL == hand_off_node) { @@ -717,7 +717,7 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac, if (ngbr_roam_info->is11rAssoc) { /* Always the BSS info in the head is the handoff candidate */ bss_node = csr_neighbor_roam_next_roamable_ap( - pMac, + mac, &ngbr_roam_info->FTRoamInfo.preAuthDoneList, NULL); sme_debug("Number of Handoff candidates: %d", @@ -728,7 +728,7 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac, if (ngbr_roam_info->isESEAssoc) { /* Always the BSS info in the head is the handoff candidate */ bss_node = - csr_neighbor_roam_next_roamable_ap(pMac, + csr_neighbor_roam_next_roamable_ap(mac, &ngbr_roam_info->FTRoamInfo.preAuthDoneList, NULL); sme_debug("Number of Handoff candidates: %d", @@ -736,10 +736,10 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac, preAuthDoneList)); } else #endif - if (csr_roam_is_fast_roam_enabled(pMac, session_id)) { + if (csr_roam_is_fast_roam_enabled(mac, session_id)) { /* Always the BSS info in the head is the handoff candidate */ bss_node = - csr_neighbor_roam_next_roamable_ap(pMac, + csr_neighbor_roam_next_roamable_ap(mac, &ngbr_roam_info->FTRoamInfo.preAuthDoneList, NULL); sme_debug("Number of Handoff candidates: %d", @@ -747,7 +747,7 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac, &ngbr_roam_info->FTRoamInfo.preAuthDoneList)); } else { bss_node = - csr_neighbor_roam_next_roamable_ap(pMac, + csr_neighbor_roam_next_roamable_ap(mac, &ngbr_roam_info->roamableAPList, NULL); sme_debug("Number of Handoff candidates: %d", @@ -770,11 +770,11 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac, * * Return: true if reassoc in progress, false otherwise */ -bool csr_neighbor_roam_is_handoff_in_progress(tpAniSirGlobal pMac, +bool csr_neighbor_roam_is_handoff_in_progress(tpAniSirGlobal mac, uint8_t sessionId) { if (eCSR_NEIGHBOR_ROAM_STATE_REASSOCIATING == - pMac->roam.neighborRoamInfo[sessionId].neighborRoamState) + mac->roam.neighborRoamInfo[sessionId].neighborRoamState) return true; return false; @@ -791,7 +791,7 @@ bool csr_neighbor_roam_is_handoff_in_progress(tpAniSirGlobal pMac, * * Return: None */ -void csr_neighbor_roam_free_neighbor_roam_bss_node(tpAniSirGlobal pMac, +void csr_neighbor_roam_free_neighbor_roam_bss_node(tpAniSirGlobal mac, tpCsrNeighborRoamBSSInfo neighborRoamBSSNode) { diff --git a/core/sme/src/csr/csr_roam_preauth.c b/core/sme/src/csr/csr_roam_preauth.c index 13c76644c315f..3ec985d43a8f0 100644 --- a/core/sme/src/csr/csr_roam_preauth.c +++ b/core/sme/src/csr/csr_roam_preauth.c @@ -414,14 +414,14 @@ 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 pMac, +bool csr_neighbor_roam_is_preauth_candidate(tpAniSirGlobal mac, uint8_t sessionId, tSirMacAddr bssId) { uint8_t i = 0; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = - &pMac->roam.neighborRoamInfo[sessionId]; + &mac->roam.neighborRoamInfo[sessionId]; - if (csr_roam_is_roam_offload_scan_enabled(pMac)) + if (csr_roam_is_roam_offload_scan_enabled(mac)) return true; if (0 == pNeighborRoamInfo->FTRoamInfo.preAuthFailList.numMACAddress) return true;