From 21aac3a7886e00b485e2df194c870eae8c593d28 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sat, 2 Feb 2019 14:26:13 -0800 Subject: [PATCH] qcacld-3.0: Rename addIeParams Per the Linux Coding Style mixed-case names are frowned upon, so rename addIeParams to add_ie_params everywhere it appears. Change-Id: Id003bf004d42d5313a932309a47bf82f228eda0c CRs-Fixed: 2393731 --- core/mac/inc/sir_api.h | 2 +- core/mac/src/pe/include/lim_session.h | 2 +- .../src/pe/lim/lim_process_sme_req_messages.c | 46 +++++++++---------- .../src/pe/lim/lim_send_management_frames.c | 16 +++---- core/mac/src/pe/lim/lim_session.c | 24 +++++----- core/mac/src/pe/lim/lim_utils.c | 4 +- core/mac/src/pe/sch/sch_api.c | 8 ++-- core/mac/src/pe/sch/sch_beacon_gen.c | 6 +-- .../src/sys/legacy/src/utils/src/parser_api.c | 4 +- core/sap/src/sap_fsm.c | 24 +++++----- core/sme/inc/csr_api.h | 2 +- core/sme/inc/csr_internal.h | 2 +- core/sme/src/csr/csr_api_roam.c | 40 ++++++++-------- 13 files changed, 89 insertions(+), 91 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index d4b4d284d2..bab8262694 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -607,7 +607,7 @@ typedef struct sSirSmeStartBssReq { bool pmfRequired; #endif - struct add_ie_params addIeParams; + struct add_ie_params add_ie_params; bool obssEnabled; uint8_t sap_dot11mc; diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h index ea3624c14a..fb04275a1f 100644 --- a/core/mac/src/pe/include/lim_session.h +++ b/core/mac/src/pe/include/lim_session.h @@ -437,7 +437,7 @@ struct pe_session { bool isCiscoVendorAP; - struct add_ie_params addIeParams; + struct add_ie_params add_ie_params; uint8_t *pSchProbeRspTemplate; /* Beginning portion of the beacon frame to be written to TFP */ diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 7d3e55b3cb..ad053fe019 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -644,29 +644,29 @@ __lim_handle_sme_start_bss_request(struct mac_context *mac_ctx, uint32_t *msg_bu if (QDF_NDI_MODE != sme_start_bss_req->bssPersona) { /* Probe resp add ie */ lim_start_bss_update_add_ie_buffer(mac_ctx, - &session->addIeParams.probeRespData_buff, - &session->addIeParams.probeRespDataLen, - sme_start_bss_req->addIeParams. + &session->add_ie_params.probeRespData_buff, + &session->add_ie_params.probeRespDataLen, + sme_start_bss_req->add_ie_params. probeRespData_buff, - sme_start_bss_req->addIeParams. + sme_start_bss_req->add_ie_params. probeRespDataLen); /* Probe Beacon add ie */ lim_start_bss_update_add_ie_buffer(mac_ctx, - &session->addIeParams.probeRespBCNData_buff, - &session->addIeParams.probeRespBCNDataLen, - sme_start_bss_req->addIeParams. + &session->add_ie_params.probeRespBCNData_buff, + &session->add_ie_params.probeRespBCNDataLen, + sme_start_bss_req->add_ie_params. probeRespBCNData_buff, - sme_start_bss_req->addIeParams. + sme_start_bss_req->add_ie_params. probeRespBCNDataLen); /* Assoc resp IE */ lim_start_bss_update_add_ie_buffer(mac_ctx, - &session->addIeParams.assocRespData_buff, - &session->addIeParams.assocRespDataLen, - sme_start_bss_req->addIeParams. + &session->add_ie_params.assocRespData_buff, + &session->add_ie_params.assocRespDataLen, + sme_start_bss_req->add_ie_params. assocRespData_buff, - sme_start_bss_req->addIeParams. + sme_start_bss_req->add_ie_params. assocRespDataLen); } /* Store the session related params in newly created session */ @@ -3094,17 +3094,17 @@ __lim_handle_sme_stop_bss_request(struct mac_context *mac, uint32_t *pMsgBuf) if (!LIM_IS_NDI_ROLE(pe_session)) { /* Free the buffer allocated in START_BSS_REQ */ - qdf_mem_free(pe_session->addIeParams.probeRespData_buff); - pe_session->addIeParams.probeRespDataLen = 0; - pe_session->addIeParams.probeRespData_buff = NULL; + qdf_mem_free(pe_session->add_ie_params.probeRespData_buff); + pe_session->add_ie_params.probeRespDataLen = 0; + pe_session->add_ie_params.probeRespData_buff = NULL; - qdf_mem_free(pe_session->addIeParams.assocRespData_buff); - pe_session->addIeParams.assocRespDataLen = 0; - pe_session->addIeParams.assocRespData_buff = NULL; + qdf_mem_free(pe_session->add_ie_params.assocRespData_buff); + pe_session->add_ie_params.assocRespDataLen = 0; + pe_session->add_ie_params.assocRespData_buff = NULL; - qdf_mem_free(pe_session->addIeParams.probeRespBCNData_buff); - pe_session->addIeParams.probeRespBCNDataLen = 0; - pe_session->addIeParams.probeRespBCNData_buff = NULL; + qdf_mem_free(pe_session->add_ie_params.probeRespBCNData_buff); + pe_session->add_ie_params.probeRespBCNDataLen = 0; + pe_session->add_ie_params.probeRespBCNData_buff = NULL; /* * lim_del_bss is also called as part of coalescing, @@ -5528,7 +5528,7 @@ static void lim_process_modify_add_ies(struct mac_context *mac_ctx, modify_add_ies->updateType); goto end; } - add_ie_params = &session_entry->addIeParams; + add_ie_params = &session_entry->add_ie_params; switch (modify_add_ies->updateType) { case eUPDATE_IE_PROBE_RESP: /* Probe resp */ @@ -5608,7 +5608,7 @@ static void lim_process_update_add_ies(struct mac_context *mac_ctx, MAC_ADDR_ARRAY(update_ie->bssid.bytes)); goto end; } - addn_ie = &session_entry->addIeParams; + addn_ie = &session_entry->add_ie_params; /* if len is 0, upper layer requested freeing of buffer */ if (0 == update_ie->ieBufferlength) { switch (update_add_ies->updateType) { diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index 5b23dfacd3..2ddd0f9053 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -673,19 +673,19 @@ lim_send_probe_rsp_mgmt_frame(struct mac_context *mac_ctx, * the message from SME to PE. */ addn_ie_present = - (pe_session->addIeParams.probeRespDataLen != 0); + (pe_session->add_ie_params.probeRespDataLen != 0); if (addn_ie_present) { add_ie = qdf_mem_malloc( - pe_session->addIeParams.probeRespDataLen); + pe_session->add_ie_params.probeRespDataLen); if (!add_ie) goto err_ret; qdf_mem_copy(add_ie, - pe_session->addIeParams.probeRespData_buff, - pe_session->addIeParams.probeRespDataLen); - addn_ie_len = pe_session->addIeParams.probeRespDataLen; + pe_session->add_ie_params.probeRespData_buff, + pe_session->add_ie_params.probeRespDataLen); + addn_ie_len = pe_session->add_ie_params.probeRespDataLen; if (QDF_STATUS_SUCCESS != lim_get_addn_ie_for_probe_resp(mac_ctx, add_ie, &addn_ie_len, preq_p2pie)) { @@ -1255,15 +1255,15 @@ lim_send_assoc_rsp_mgmt_frame(struct mac_context *mac_ctx, lim_obss_send_detection_cfg(mac_ctx, pe_session, false); if (assoc_req != NULL) { - addn_ie_len = pe_session->addIeParams.assocRespDataLen; + addn_ie_len = pe_session->add_ie_params.assocRespDataLen; /* Nonzero length indicates Assoc rsp IE available */ if (addn_ie_len > 0 && addn_ie_len <= WNI_CFG_ASSOC_RSP_ADDNIE_DATA_LEN && (bytes + addn_ie_len) <= SIR_MAX_PACKET_SIZE) { qdf_mem_copy(add_ie, - pe_session->addIeParams.assocRespData_buff, - pe_session->addIeParams.assocRespDataLen); + pe_session->add_ie_params.assocRespData_buff, + pe_session->add_ie_params.assocRespDataLen); qdf_mem_zero((uint8_t *) &extracted_ext_cap, sizeof(extracted_ext_cap)); diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c index 0e4fb9fc39..55c1bef463 100644 --- a/core/mac/src/pe/lim/lim_session.c +++ b/core/mac/src/pe/lim/lim_session.c @@ -1017,20 +1017,20 @@ void pe_delete_session(struct mac_context *mac_ctx, struct pe_session *session) } /* Must free the buffer before peSession invalid */ - if (NULL != session->addIeParams.probeRespData_buff) { - qdf_mem_free(session->addIeParams.probeRespData_buff); - session->addIeParams.probeRespData_buff = NULL; - session->addIeParams.probeRespDataLen = 0; + if (NULL != session->add_ie_params.probeRespData_buff) { + qdf_mem_free(session->add_ie_params.probeRespData_buff); + session->add_ie_params.probeRespData_buff = NULL; + session->add_ie_params.probeRespDataLen = 0; } - if (NULL != session->addIeParams.assocRespData_buff) { - qdf_mem_free(session->addIeParams.assocRespData_buff); - session->addIeParams.assocRespData_buff = NULL; - session->addIeParams.assocRespDataLen = 0; + if (NULL != session->add_ie_params.assocRespData_buff) { + qdf_mem_free(session->add_ie_params.assocRespData_buff); + session->add_ie_params.assocRespData_buff = NULL; + session->add_ie_params.assocRespDataLen = 0; } - if (NULL != session->addIeParams.probeRespBCNData_buff) { - qdf_mem_free(session->addIeParams.probeRespBCNData_buff); - session->addIeParams.probeRespBCNData_buff = NULL; - session->addIeParams.probeRespBCNDataLen = 0; + if (NULL != session->add_ie_params.probeRespBCNData_buff) { + qdf_mem_free(session->add_ie_params.probeRespBCNData_buff); + session->add_ie_params.probeRespBCNData_buff = NULL; + session->add_ie_params.probeRespBCNDataLen = 0; } #ifdef WLAN_FEATURE_11W if (QDF_TIMER_STATE_RUNNING == diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 4e3a5f85c9..c19e7ae8ed 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -6896,7 +6896,7 @@ void lim_update_stads_he_caps(tpDphHashNode sta_ds, tpSirAssocRsp assoc_rsp, void lim_update_usr_he_cap(struct mac_context *mac_ctx, struct pe_session *session) { - struct add_ie_params *add_ie = &session->addIeParams; + struct add_ie_params *add_ie = &session->add_ie_params; tDot11fIEhe_cap *he_cap = &session->he_config; struct he_cap_network_endian *he_cap_from_ie; uint8_t extracted_buff[DOT11F_IE_HE_CAP_MAX_LEN + 2]; @@ -6936,7 +6936,7 @@ void lim_decide_he_op(struct mac_context *mac_ctx, tpAddBssParams add_bss, uint8_t color; struct he_ops_network_endian *he_ops_from_ie; tDot11fIEhe_op *he_ops = &add_bss->he_op; - struct add_ie_params *add_ie = &session->addIeParams; + struct add_ie_params *add_ie = &session->add_ie_params; uint8_t extracted_buff[DOT11F_IE_HE_OP_MAX_LEN + 2]; QDF_STATUS status; diff --git a/core/mac/src/pe/sch/sch_api.c b/core/mac/src/pe/sch/sch_api.c index 3fc6cddce4..dc57ce3ec4 100644 --- a/core/mac/src/pe/sch/sch_api.c +++ b/core/mac/src/pe/sch/sch_api.c @@ -155,8 +155,8 @@ static uint32_t lim_remove_p2p_ie_from_add_ie(struct mac_context *mac, uint8_t *addIeWoP2pIe, uint32_t *addnIELenWoP2pIe) { - uint32_t left = pe_session->addIeParams.probeRespDataLen; - uint8_t *ptr = pe_session->addIeParams.probeRespData_buff; + uint32_t left = pe_session->add_ie_params.probeRespDataLen; + uint8_t *ptr = pe_session->add_ie_params.probeRespData_buff; uint8_t elem_id, elem_len; uint32_t offset = 0; uint8_t eid = 0xDD; @@ -212,7 +212,7 @@ uint32_t lim_send_probe_rsp_template_to_hal(struct mac_context *mac, uint16_t addn_ielen = 0; /* Check if probe response IE is present or not */ - addnIEPresent = (pe_session->addIeParams.probeRespDataLen != 0); + addnIEPresent = (pe_session->add_ie_params.probeRespDataLen != 0); if (addnIEPresent) { /* * probe response template should not have P2P IE. @@ -224,7 +224,7 @@ uint32_t lim_send_probe_rsp_template_to_hal(struct mac_context *mac, * by the FW, may also have P2P IE which will fail * P2P cert case 6.1.3 */ - addIeWoP2pIe = qdf_mem_malloc(pe_session->addIeParams. + addIeWoP2pIe = qdf_mem_malloc(pe_session->add_ie_params. probeRespDataLen); if (NULL == addIeWoP2pIe) { pe_err("FAILED to alloc memory when removing P2P IE"); diff --git a/core/mac/src/pe/sch/sch_beacon_gen.c b/core/mac/src/pe/sch/sch_beacon_gen.c index da7cfa782c..a21ef53bdd 100644 --- a/core/mac/src/pe/sch/sch_beacon_gen.c +++ b/core/mac/src/pe/sch/sch_beacon_gen.c @@ -542,9 +542,9 @@ sch_set_fixed_beacon_fields(struct mac_context *mac_ctx, struct pe_session *sess } - addnie_present = (session->addIeParams.probeRespBCNDataLen != 0); + addnie_present = (session->add_ie_params.probeRespBCNDataLen != 0); if (addnie_present) { - addn_ielen = session->addIeParams.probeRespBCNDataLen; + addn_ielen = session->add_ie_params.probeRespBCNDataLen; addn_ie = qdf_mem_malloc(addn_ielen); if (!addn_ie) { qdf_mem_free(bcn_1); @@ -553,7 +553,7 @@ sch_set_fixed_beacon_fields(struct mac_context *mac_ctx, struct pe_session *sess return QDF_STATUS_E_NOMEM; } qdf_mem_copy(addn_ie, - session->addIeParams.probeRespBCNData_buff, + session->add_ie_params.probeRespBCNData_buff, addn_ielen); qdf_mem_zero((uint8_t *)&extracted_extcap, diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index 3e8e4ad57a..045ae23251 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -301,8 +301,8 @@ populate_dot11f_chan_switch_wrapper(struct mac_context *mac, */ ie_ptr = wlan_get_ie_ptr_from_eid( DOT11F_EID_VHT_TRANSMIT_POWER_ENV, - pe_session->addIeParams.probeRespBCNData_buff, - pe_session->addIeParams.probeRespBCNDataLen); + pe_session->add_ie_params.probeRespBCNData_buff, + pe_session->add_ie_params.probeRespBCNDataLen); if (ie_ptr) { /* Ignore EID field */ pDot11f->vht_transmit_power_env.present = 1; diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index 22963794f9..cfba3c7599 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -2932,35 +2932,35 @@ sapconvert_to_csr_profile(tsap_config_t *pconfig_params, eCsrRoamBssType bssType if (pconfig_params->probeRespIEsBufferLen > 0 && pconfig_params->pProbeRespIEsBuffer != NULL) { - profile->addIeParams.probeRespDataLen = + profile->add_ie_params.probeRespDataLen = pconfig_params->probeRespIEsBufferLen; - profile->addIeParams.probeRespData_buff = + profile->add_ie_params.probeRespData_buff = pconfig_params->pProbeRespIEsBuffer; } else { - profile->addIeParams.probeRespDataLen = 0; - profile->addIeParams.probeRespData_buff = NULL; + profile->add_ie_params.probeRespDataLen = 0; + profile->add_ie_params.probeRespData_buff = NULL; } /*assoc resp IE */ if (pconfig_params->assocRespIEsLen > 0 && pconfig_params->pAssocRespIEsBuffer != NULL) { - profile->addIeParams.assocRespDataLen = + profile->add_ie_params.assocRespDataLen = pconfig_params->assocRespIEsLen; - profile->addIeParams.assocRespData_buff = + profile->add_ie_params.assocRespData_buff = pconfig_params->pAssocRespIEsBuffer; } else { - profile->addIeParams.assocRespDataLen = 0; - profile->addIeParams.assocRespData_buff = NULL; + profile->add_ie_params.assocRespDataLen = 0; + profile->add_ie_params.assocRespData_buff = NULL; } if (pconfig_params->probeRespBcnIEsLen > 0 && pconfig_params->pProbeRespBcnIEsBuffer != NULL) { - profile->addIeParams.probeRespBCNDataLen = + profile->add_ie_params.probeRespBCNDataLen = pconfig_params->probeRespBcnIEsLen; - profile->addIeParams.probeRespBCNData_buff = + profile->add_ie_params.probeRespBCNData_buff = pconfig_params->pProbeRespBcnIEsBuffer; } else { - profile->addIeParams.probeRespBCNDataLen = 0; - profile->addIeParams.probeRespBCNData_buff = NULL; + profile->add_ie_params.probeRespBCNDataLen = 0; + profile->add_ie_params.probeRespBCNData_buff = NULL; } if (pconfig_params->supported_rates.numRates) { diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index d8ea581a39..28197d29d3 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -816,7 +816,7 @@ struct csr_roam_profile { struct mobility_domain_info mdid; enum QDF_OPMODE csrPersona; /* addIe params */ - struct add_ie_params addIeParams; + struct add_ie_params add_ie_params; uint16_t beacon_tx_rate; tSirMacRateSet supported_rates; tSirMacRateSet extended_rates; diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index a17b824592..eb6a69e7f8 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -267,7 +267,7 @@ struct csr_roamstart_bssparams { bool mfpCapable; bool mfpRequired; #endif - struct add_ie_params addIeParams; + struct add_ie_params add_ie_params; uint8_t sap_dot11mc; uint16_t beacon_tx_rate; uint32_t cac_duration_ms; diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 83a0f6138f..c02afde094 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -7496,7 +7496,7 @@ QDF_STATUS csr_roam_copy_profile(struct mac_context *mac, pDstProfile->MFPCapable = pSrcProfile->MFPCapable; #endif pDstProfile->mdid = pSrcProfile->mdid; - pDstProfile->addIeParams = pSrcProfile->addIeParams; + pDstProfile->add_ie_params = pSrcProfile->add_ie_params; update_profile_fils_info(pDstProfile, pSrcProfile); @@ -13378,25 +13378,25 @@ QDF_STATUS csr_roam_issue_start_bss(struct mac_context *mac, uint32_t sessionId, pParam->mfpRequired = (0 != pProfile->MFPRequired); #endif - pParam->addIeParams.probeRespDataLen = - pProfile->addIeParams.probeRespDataLen; - pParam->addIeParams.probeRespData_buff = - pProfile->addIeParams.probeRespData_buff; + pParam->add_ie_params.probeRespDataLen = + pProfile->add_ie_params.probeRespDataLen; + pParam->add_ie_params.probeRespData_buff = + pProfile->add_ie_params.probeRespData_buff; - pParam->addIeParams.assocRespDataLen = - pProfile->addIeParams.assocRespDataLen; - pParam->addIeParams.assocRespData_buff = - pProfile->addIeParams.assocRespData_buff; + pParam->add_ie_params.assocRespDataLen = + pProfile->add_ie_params.assocRespDataLen; + pParam->add_ie_params.assocRespData_buff = + pProfile->add_ie_params.assocRespData_buff; if (CSR_IS_IBSS(pProfile)) { - pParam->addIeParams.probeRespBCNDataLen = + pParam->add_ie_params.probeRespBCNDataLen = pProfile->nWPAReqIELength; - pParam->addIeParams.probeRespBCNData_buff = pProfile->pWPAReqIE; + pParam->add_ie_params.probeRespBCNData_buff = pProfile->pWPAReqIE; } else { - pParam->addIeParams.probeRespBCNDataLen = - pProfile->addIeParams.probeRespBCNDataLen; - pParam->addIeParams.probeRespBCNData_buff = - pProfile->addIeParams.probeRespBCNData_buff; + pParam->add_ie_params.probeRespBCNDataLen = + pProfile->add_ie_params.probeRespBCNDataLen; + pParam->add_ie_params.probeRespBCNData_buff = + pProfile->add_ie_params.probeRespBCNData_buff; } if (pProfile->csrPersona == QDF_SAP_MODE) @@ -15833,13 +15833,10 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(struct mac_context *mac, uint32_t pParam->operationChn); } - qdf_mem_copy(&pMsg->addIeParams, - &pParam->addIeParams, - sizeof(pParam->addIeParams)); + pMsg->add_ie_params = pParam->add_ie_params; pMsg->obssEnabled = mac->roam.configParam.obssEnabled; pMsg->sap_dot11mc = pParam->sap_dot11mc; - pMsg->vendor_vht_sap = - mac->roam.configParam.vendor_vht_sap; + pMsg->vendor_vht_sap = mac->roam.configParam.vendor_vht_sap; pMsg->cac_duration_ms = pParam->cac_duration_ms; pMsg->dfs_regdomain = pParam->dfs_regdomain; pMsg->beacon_tx_rate = pParam->beacon_tx_rate; @@ -15847,7 +15844,8 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(struct mac_context *mac, uint32_t return umac_send_mb_message_to_mac(pMsg); } -QDF_STATUS csr_send_mb_stop_bss_req_msg(struct mac_context *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);