From 7fb14221a50d980229df4c9a35e06cc43e81dab5 Mon Sep 17 00:00:00 2001 From: Pragaspathi Thilagaraj Date: Mon, 17 Jun 2019 23:26:58 +0530 Subject: [PATCH] qcacld-3.0: Rename selfMacAddr Linux coding guidelines don't allow use of camel case identifiers. So rename selfMacAddr to self_mac_addr to be in compliance. Change-Id: Id70e00744883f9fd797da8d4bb1cf4f65c8aa9ff CRs-Fixed: 2463827 --- core/mac/inc/sir_api.h | 2 +- core/mac/src/pe/include/lim_session.h | 4 +- core/mac/src/pe/lim/lim_api.c | 8 ++-- core/mac/src/pe/lim/lim_assoc_utils.c | 16 +++---- core/mac/src/pe/lim/lim_ft.c | 8 ++-- core/mac/src/pe/lim/lim_ft_preauth.c | 4 +- core/mac/src/pe/lim/lim_ibss_peer_mgmt.c | 2 +- .../mac/src/pe/lim/lim_link_monitoring_algo.c | 4 +- .../mac/src/pe/lim/lim_process_action_frame.c | 4 +- .../src/pe/lim/lim_process_assoc_req_frame.c | 5 ++- .../src/pe/lim/lim_process_assoc_rsp_frame.c | 2 +- core/mac/src/pe/lim/lim_process_fils.c | 14 +++---- .../src/pe/lim/lim_process_mlm_host_roam.c | 6 +-- .../src/pe/lim/lim_process_mlm_req_messages.c | 12 +++--- .../src/pe/lim/lim_process_mlm_rsp_messages.c | 14 +++---- .../src/pe/lim/lim_process_sme_req_messages.c | 8 ++-- core/mac/src/pe/lim/lim_process_tdls.c | 4 +- .../src/pe/lim/lim_send_frames_host_roam.c | 4 +- .../src/pe/lim/lim_send_management_frames.c | 42 +++++++++---------- core/mac/src/pe/lim/lim_send_messages.c | 6 +-- core/mac/src/pe/lim/lim_session.c | 2 +- core/mac/src/pe/lim/lim_sme_req_utils.c | 6 +-- core/mac/src/pe/lim/lim_utils.c | 8 ++-- core/mac/src/pe/nan/nan_datapath.c | 4 +- core/mac/src/pe/rrm/rrm_api.c | 2 +- core/mac/src/pe/sch/sch_api.c | 4 +- core/mac/src/pe/sch/sch_beacon_gen.c | 4 +- core/mac/src/pe/sch/sch_beacon_process.c | 2 +- core/sme/inc/csr_internal.h | 4 +- core/sme/src/common/sme_api.c | 2 +- core/sme/src/csr/csr_api_roam.c | 27 ++++++------ core/sme/src/csr/csr_api_scan.c | 2 +- core/sme/src/csr/csr_roam_preauth.c | 2 +- core/wma/inc/wma_if.h | 8 ++-- core/wma/src/wma_data.c | 6 +-- core/wma/src/wma_dev_if.c | 12 +++--- core/wma/src/wma_nan_datapath.c | 7 ++-- core/wma/src/wma_scan_roam.c | 4 +- 38 files changed, 139 insertions(+), 136 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 63ebd207bdc7..c4f89ca469e3 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -884,7 +884,7 @@ struct join_req { uint16_t length; uint8_t sessionId; tSirMacSSid ssId; - tSirMacAddr selfMacAddr; /* self Mac address */ + tSirMacAddr self_mac_addr; /* self Mac address */ enum bss_type bsstype; /* add new type for BT-AMP STA and AP Modules */ uint8_t dot11mode; /* to support BT-AMP */ #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h index 11944a527379..e0f2b1ee631d 100644 --- a/core/mac/src/pe/include/lim_session.h +++ b/core/mac/src/pe/include/lim_session.h @@ -144,10 +144,10 @@ struct pe_session { }; struct wlan_objmgr_vdev *vdev; - /* In AP role: BSSID and selfMacAddr will be the same. */ + /* In AP role: BSSID and self_mac_addr will be the same. */ /* In STA role: they will be different */ tSirMacAddr bssId; - tSirMacAddr selfMacAddr; + tSirMacAddr self_mac_addr; tSirMacSSid ssId; uint8_t bss_idx; uint8_t valid; diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index ef7bc78d39d2..de398a8b5035 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -1646,7 +1646,7 @@ lim_detect_change_in_ap_capabilities(struct mac_context *mac, lim_send_probe_req_mgmt_frame(mac, &pe_session->ssId, pe_session->bssId, pe_session->currentOperChannel, - pe_session->selfMacAddr, + pe_session->self_mac_addr, pe_session->dot11mode, NULL, NULL); @@ -2370,10 +2370,10 @@ pe_roam_synch_callback(struct mac_context *mac_ctx, /* Update the beacon/probe filter in mac_ctx */ lim_set_bcn_probe_filter(mac_ctx, ft_session_ptr, NULL, 0); - sir_copy_mac_addr(ft_session_ptr->selfMacAddr, - session_ptr->selfMacAddr); + sir_copy_mac_addr(ft_session_ptr->self_mac_addr, + session_ptr->self_mac_addr); sir_copy_mac_addr(roam_sync_ind_ptr->self_mac.bytes, - session_ptr->selfMacAddr); + session_ptr->self_mac_addr); sir_copy_mac_addr(ft_session_ptr->limReAssocbssId, bss_desc->bssId); session_ptr->bRoamSynchInProgress = true; ft_session_ptr->bRoamSynchInProgress = true; diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index 2ef4be563576..321fffeb61f9 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -2130,7 +2130,7 @@ lim_add_sta(struct mac_context *mac_ctx, vht_cap_info = &mac_ctx->mlme_cfg->vht_caps.vht_cap_info; - sir_copy_mac_addr(sta_mac, session_entry->selfMacAddr); + sir_copy_mac_addr(sta_mac, session_entry->self_mac_addr); pe_debug("sessionid: %d update_entry = %d limsystemrole = %d", session_entry->smeSessionId, update_entry, @@ -2757,7 +2757,7 @@ lim_add_sta_self(struct mac_context *mac, uint16_t staIdx, uint8_t updateSta, pe_debug("Roam Channel Bonding Mode %d", (int)mac->roam.configParam.uCfgDot11Mode); - sir_copy_mac_addr(staMac, pe_session->selfMacAddr); + sir_copy_mac_addr(staMac, pe_session->self_mac_addr); pe_debug(QDF_MAC_ADDR_STR ": ", QDF_MAC_ADDR_ARRAY(staMac)); pAddStaParams = qdf_mem_malloc(sizeof(tAddStaParams)); if (!pAddStaParams) @@ -3578,9 +3578,9 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp qdf_mem_copy(pAddBssParams->bssId, bssDescription->bssId, sizeof(tSirMacAddr)); - /* Fill in tAddBssParams selfMacAddr */ - qdf_mem_copy(pAddBssParams->selfMacAddr, - pe_session->selfMacAddr, sizeof(tSirMacAddr)); + /* Fill in tAddBssParams self_mac_addr */ + qdf_mem_copy(pAddBssParams->self_mac_addr, + pe_session->self_mac_addr, sizeof(tSirMacAddr)); pe_debug("sessionid: %d updateEntry: %d limsystemrole: %d", pe_session->smeSessionId, updateEntry, @@ -4127,9 +4127,9 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac, uint8_t updat qdf_mem_copy(pAddBssParams->bssId, bssDescription->bssId, sizeof(tSirMacAddr)); - /* Fill in tAddBssParams selfMacAddr */ - qdf_mem_copy(pAddBssParams->selfMacAddr, - pe_session->selfMacAddr, sizeof(tSirMacAddr)); + /* Fill in tAddBssParams self_mac_addr */ + qdf_mem_copy(pAddBssParams->self_mac_addr, + pe_session->self_mac_addr, sizeof(tSirMacAddr)); pe_debug("sessionid: %d updateEntry = %d limsystemrole = %d", pe_session->smeSessionId, updateEntry, GET_LIM_SYSTEM_ROLE(pe_session)); diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index a784dafdd501..2cd335285431 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -155,8 +155,8 @@ void lim_ft_prepare_add_bss_req(struct mac_context *mac, qdf_mem_copy(pAddBssParams->bssId, bssDescription->bssId, sizeof(tSirMacAddr)); - /* Fill in tAddBssParams selfMacAddr */ - qdf_mem_copy(pAddBssParams->selfMacAddr, ft_session->selfMacAddr, + /* Fill in tAddBssParams self_mac_addr */ + qdf_mem_copy(pAddBssParams->self_mac_addr, ft_session->self_mac_addr, sizeof(tSirMacAddr)); pAddBssParams->bssType = ft_session->bssType; @@ -671,8 +671,8 @@ void lim_fill_ft_session(struct mac_context *mac, ft_session->ch_center_freq_seg1 = 0; } - sir_copy_mac_addr(ft_session->selfMacAddr, - pe_session->selfMacAddr); + sir_copy_mac_addr(ft_session->self_mac_addr, + pe_session->self_mac_addr); sir_copy_mac_addr(ft_session->limReAssocbssId, pbssDescription->bssId); sir_copy_mac_addr(ft_session->prev_ap_bssid, pe_session->bssId); diff --git a/core/mac/src/pe/lim/lim_ft_preauth.c b/core/mac/src/pe/lim/lim_ft_preauth.c index 0ce5d9d1c996..8abacf4dd99d 100644 --- a/core/mac/src/pe/lim/lim_ft_preauth.c +++ b/core/mac/src/pe/lim/lim_ft_preauth.c @@ -450,8 +450,8 @@ void lim_handle_ft_pre_auth_rsp(struct mac_context *mac, QDF_STATUS status, goto send_rsp; } - sir_copy_mac_addr(ft_session->selfMacAddr, - pe_session->selfMacAddr); + sir_copy_mac_addr(ft_session->self_mac_addr, + pe_session->self_mac_addr); sir_copy_mac_addr(ft_session->limReAssocbssId, pbssDescription->bssId); diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c index 7aaeab12b3c6..680c6651e64d 100644 --- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c +++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c @@ -1305,7 +1305,7 @@ void lim_ibss_del_bss_rsp(struct mac_context *mac, void *msg, struct pe_session } if (lim_set_link_state(mac, eSIR_LINK_IDLE_STATE, nullBssid, - pe_session->selfMacAddr, NULL, + pe_session->self_mac_addr, NULL, NULL) != QDF_STATUS_SUCCESS) { pe_err("IBSS: DEL_BSS_RSP setLinkState failed"); rc = eSIR_SME_REFUSED; diff --git a/core/mac/src/pe/lim/lim_link_monitoring_algo.c b/core/mac/src/pe/lim/lim_link_monitoring_algo.c index c187a753520c..bf9b7f8c16ec 100644 --- a/core/mac/src/pe/lim/lim_link_monitoring_algo.c +++ b/core/mac/src/pe/lim/lim_link_monitoring_algo.c @@ -522,14 +522,14 @@ void lim_handle_heart_beat_failure(struct mac_context *mac_ctx, lim_send_probe_req_mgmt_frame(mac_ctx, &session->ssId, session->bssId, curr_chan, - session->selfMacAddr, + session->self_mac_addr, session->dot11mode, &scan_ie->length, scan_ie->addIEdata); } else { lim_send_probe_req_mgmt_frame(mac_ctx, &session->ssId, session->bssId, curr_chan, - session->selfMacAddr, + session->self_mac_addr, session->dot11mode, NULL, NULL); } } else { diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c index 023df46d763f..46da1f7334b9 100644 --- a/core/mac/src/pe/lim/lim_process_action_frame.c +++ b/core/mac/src/pe/lim/lim_process_action_frame.c @@ -2009,7 +2009,7 @@ void lim_process_action_frame(struct mac_context *mac_ctx, /* Check if it is a vendor specific action frame. */ if (LIM_IS_STA_ROLE(session) && - (!qdf_mem_cmp(session->selfMacAddr, + (!qdf_mem_cmp(session->self_mac_addr, &mac_hdr->da[0], sizeof(tSirMacAddr))) && IS_WES_MODE_ENABLED(mac_ctx) && !qdf_mem_cmp(vendor_specific->Oui, oui, 3)) { @@ -2181,7 +2181,7 @@ void lim_process_action_frame(struct mac_context *mac_ctx, break; case ACTION_CATEGORY_BACK: pe_debug("Rcvd Block Ack for %pM; action: %d", - session->selfMacAddr, action_hdr->actionID); + session->self_mac_addr, action_hdr->actionID); switch (action_hdr->actionID) { case ADDBA_REQUEST: lim_process_addba_req(mac_ctx, rx_pkt_info, session); diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c index 2b04ce48680b..d6d37c06ba6c 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c @@ -174,8 +174,9 @@ static QDF_STATUS lim_check_sta_in_pe_entries(struct mac_context *mac_ctx, } sta_ds->sta_deletion_in_progress = true; pe_err("Sending Disassoc and Deleting existing STA entry:" - QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(session->selfMacAddr)); + QDF_MAC_ADDR_STR, + QDF_MAC_ADDR_ARRAY( + session->self_mac_addr)); lim_send_disassoc_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_REASON, (uint8_t *) hdr->sa, session, false); diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c index bdda4406fbec..39442004eea9 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c @@ -848,7 +848,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, if (lim_set_link_state (mac_ctx, eSIR_LINK_POSTASSOC_STATE, session_entry->bssId, - session_entry->selfMacAddr, NULL, + session_entry->self_mac_addr, NULL, NULL) != QDF_STATUS_SUCCESS) { pe_err("Set link state to POSTASSOC failed"); qdf_mem_free(beacon); diff --git a/core/mac/src/pe/lim/lim_process_fils.c b/core/mac/src/pe/lim/lim_process_fils.c index 3951c91f298f..d5fa45b019f4 100644 --- a/core/mac/src/pe/lim/lim_process_fils.c +++ b/core/mac/src/pe/lim/lim_process_fils.c @@ -533,7 +533,7 @@ static void lim_generate_ap_key_auth(struct pe_session *pe_session) buf += SIR_FILS_NONCE_LENGTH; qdf_mem_copy(buf, pe_session->bssId, QDF_MAC_ADDR_SIZE); buf += QDF_MAC_ADDR_SIZE; - qdf_mem_copy(buf, pe_session->selfMacAddr, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(buf, pe_session->self_mac_addr, QDF_MAC_ADDR_SIZE); buf += QDF_MAC_ADDR_SIZE; if (qdf_get_hmac_hash(lim_get_hmac_crypto_type(fils_info->akm), @@ -574,7 +574,7 @@ static void lim_generate_key_auth(struct pe_session *pe_session) qdf_mem_copy(buf, fils_info->auth_info.fils_nonce, SIR_FILS_NONCE_LENGTH); buf += SIR_FILS_NONCE_LENGTH; - qdf_mem_copy(buf, pe_session->selfMacAddr, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(buf, pe_session->self_mac_addr, QDF_MAC_ADDR_SIZE); buf += QDF_MAC_ADDR_SIZE; qdf_mem_copy(buf, pe_session->bssId, QDF_MAC_ADDR_SIZE); buf += QDF_MAC_ADDR_SIZE; @@ -644,7 +644,7 @@ static void lim_get_keys(struct pe_session *pe_session) /* data is SPA || AA ||SNonce || ANonce */ buf = data; - qdf_mem_copy(buf, pe_session->selfMacAddr, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(buf, pe_session->self_mac_addr, QDF_MAC_ADDR_SIZE); buf += QDF_MAC_ADDR_SIZE; qdf_mem_copy(buf, pe_session->bssId, QDF_MAC_ADDR_SIZE); @@ -1265,7 +1265,7 @@ static QDF_STATUS lim_generate_fils_pmkr0(struct pe_session *pe_session) qdf_mem_copy(key_data, fils_info->ft_ie.r0kh_id, r0kh_len); key_data += r0kh_len; - qdf_mem_copy(key_data, pe_session->selfMacAddr, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(key_data, pe_session->self_mac_addr, QDF_MAC_ADDR_SIZE); pe_debug("FT-FILS: Derive R0-Key-Data"); status = lim_get_key_from_prf(lim_get_hmac_crypto_type(fils_info->akm), @@ -1350,7 +1350,7 @@ static QDF_STATUS lim_generate_fils_pmkr1_name(struct pe_session *pe_session) len[SCTR_LST_ELEM1] = FILS_PMK_NAME_LEN; scatter_list[SCTR_LST_ELEM2] = fils_info->ft_ie.r1kh_id; len[SCTR_LST_ELEM2] = FT_R1KH_ID_LEN; - scatter_list[SCTR_LST_ELEM3] = pe_session->selfMacAddr; + scatter_list[SCTR_LST_ELEM3] = pe_session->self_mac_addr; len[SCTR_LST_ELEM3] = QDF_MAC_ADDR_SIZE; if (qdf_get_hash(lim_get_hash_crypto_type(fils_info->akm), @@ -2076,7 +2076,7 @@ QDF_STATUS aead_encrypt_assoc_req(struct mac_context *mac_ctx, /* Overwrite the AEAD encrypted output @ plain_text */ if (fils_aead_encrypt(fils_info->kek, fils_info->kek_len, - pe_session->selfMacAddr, pe_session->bssId, + pe_session->self_mac_addr, pe_session->bssId, fils_info->fils_nonce, fils_info->auth_info.fils_nonce, data, data_len, plain_text, plain_text_len, @@ -2222,7 +2222,7 @@ QDF_STATUS aead_decrypt_assoc_rsp(struct mac_context *mac_ctx, data_len = (*n_frame) - fils_ies_len; if (fils_aead_decrypt(fils_info->kek, fils_info->kek_len, - session->selfMacAddr, session->bssId, + session->self_mac_addr, session->bssId, fils_info->fils_nonce, fils_info->auth_info.fils_nonce, p_frame, data_len, diff --git a/core/mac/src/pe/lim/lim_process_mlm_host_roam.c b/core/mac/src/pe/lim/lim_process_mlm_host_roam.c index a0ef6190380f..a1e74ec6dc96 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_host_roam.c +++ b/core/mac/src/pe/lim/lim_process_mlm_host_roam.c @@ -476,8 +476,8 @@ void lim_process_sta_mlm_add_bss_rsp_ft(struct mac_context *mac, goto end; /* / Add STA context at MAC HW (BMU, RHP & TFP) */ - qdf_mem_copy((uint8_t *) pAddStaParams->staMac, - (uint8_t *) pe_session->selfMacAddr, + qdf_mem_copy((uint8_t *)pAddStaParams->staMac, + (uint8_t *)pe_session->self_mac_addr, sizeof(tSirMacAddr)); qdf_mem_copy((uint8_t *) pAddStaParams->bssId, @@ -665,7 +665,7 @@ void lim_process_mlm_ft_reassoc_req(struct mac_context *mac, if (lim_set_link_state (mac, eSIR_LINK_PREASSOC_STATE, session->bssId, - session->selfMacAddr, NULL, NULL) != QDF_STATUS_SUCCESS) { + session->self_mac_addr, NULL, NULL) != QDF_STATUS_SUCCESS) { qdf_mem_free(reassoc_req); return; } diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index ea7cecc850f4..99e137beb215 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -183,7 +183,7 @@ static void mlm_add_sta(struct mac_context *mac_ctx, tpAddStaParams sta_param, sta_param->staType = STA_ENTRY_SELF; /* Identifying self */ qdf_mem_copy(sta_param->bssId, bssid, sizeof(tSirMacAddr)); - qdf_mem_copy(sta_param->staMac, session_entry->selfMacAddr, + qdf_mem_copy(sta_param->staMac, session_entry->self_mac_addr, sizeof(tSirMacAddr)); /* Configuration related parameters to be changed to support BT-AMP */ @@ -312,9 +312,9 @@ lim_mlm_add_bss(struct mac_context *mac_ctx, qdf_mem_copy(addbss_param->bssId, mlm_start_req->bssId, sizeof(tSirMacAddr)); - /* Fill in tAddBssParams selfMacAddr */ - qdf_mem_copy(addbss_param->selfMacAddr, - session->selfMacAddr, sizeof(tSirMacAddr)); + /* Fill in tAddBssParams self_mac_addr */ + qdf_mem_copy(addbss_param->self_mac_addr, + session->self_mac_addr, sizeof(tSirMacAddr)); addbss_param->bssType = mlm_start_req->bssType; if (mlm_start_req->bssType == eSIR_IBSS_MODE) @@ -653,7 +653,7 @@ lim_process_mlm_post_join_suspend_link(struct mac_context *mac_ctx, pe_session_param->session_id = session->peSessionId; if (lim_set_link_state(mac_ctx, lnk_state, session->pLimMlmJoinReq->bssDescription.bssId, - session->selfMacAddr, + session->self_mac_addr, lim_post_join_set_link_state_callback, pe_session_param) != QDF_STATUS_SUCCESS) { pe_err("SessionId:%d lim_set_link_state to eSIR_LINK_PREASSOC_STATE Failed!!", @@ -2126,7 +2126,7 @@ static void lim_process_periodic_join_probe_req_timer(struct mac_context *mac_ct lim_send_probe_req_mgmt_frame(mac_ctx, &ssid, session->pLimMlmJoinReq->bssDescription.bssId, session->currentOperChannel /*chanNum */, - session->selfMacAddr, session->dot11mode, + session->self_mac_addr, session->dot11mode, &session->pLimJoinReq->addIEScan.length, session->pLimJoinReq->addIEScan.addIEdata); lim_deactivate_and_change_timer(mac_ctx, diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index 83c77b8e62f7..47769c1a5122 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -1296,7 +1296,7 @@ error: } if (lim_set_link_state(mac_ctx, eSIR_LINK_DOWN_STATE, session->bssId, - session->selfMacAddr, + session->self_mac_addr, lim_join_result_callback, link_state_arg) != QDF_STATUS_SUCCESS) { qdf_mem_free(link_state_arg); @@ -1599,7 +1599,7 @@ void lim_process_sta_mlm_del_bss_rsp(struct mac_context *mac, pDelBssParams->bss_idx); if (lim_set_link_state (mac, eSIR_LINK_IDLE_STATE, pe_session->bssId, - pe_session->selfMacAddr, NULL, + pe_session->self_mac_addr, NULL, NULL) != QDF_STATUS_SUCCESS) { pe_err("Failure in setting link state to IDLE"); status_code = eSIR_SME_REFUSED; @@ -1689,7 +1689,7 @@ void lim_process_ap_mlm_del_bss_rsp(struct mac_context *mac, goto end; } status = lim_set_link_state(mac, eSIR_LINK_IDLE_STATE, nullBssid, - pe_session->selfMacAddr, NULL, NULL); + pe_session->self_mac_addr, NULL, NULL); if (status != QDF_STATUS_SUCCESS) { rc = eSIR_SME_REFUSED; goto end; @@ -2050,7 +2050,7 @@ static void lim_process_ap_mlm_add_bss_rsp(struct mac_context *mac, pe_debug("WMA_ADD_BSS_RSP returned with QDF_STATUS_SUCCESS"); if (lim_set_link_state (mac, eSIR_LINK_AP_STATE, pe_session->bssId, - pe_session->selfMacAddr, NULL, + pe_session->self_mac_addr, NULL, NULL) != QDF_STATUS_SUCCESS) goto end; /* Set MLME state */ @@ -2184,7 +2184,7 @@ lim_process_ibss_mlm_add_bss_rsp(struct mac_context *mac, if (lim_set_link_state (mac, eSIR_LINK_IBSS_STATE, pe_session->bssId, - pe_session->selfMacAddr, NULL, + pe_session->self_mac_addr, NULL, NULL) != QDF_STATUS_SUCCESS) goto end; /* Set MLME state */ @@ -2491,7 +2491,7 @@ lim_process_sta_mlm_add_bss_rsp(struct mac_context *mac_ctx, session_entry->limMlmState = eLIM_MLM_IDLE_STATE; if (lim_set_link_state(mac_ctx, eSIR_LINK_IDLE_STATE, session_entry->bssId, - session_entry->selfMacAddr, + session_entry->self_mac_addr, NULL, NULL) != QDF_STATUS_SUCCESS) pe_err("Failed to set the LinkState"); /* Update PE session Id */ @@ -3086,7 +3086,7 @@ static void lim_process_switch_channel_join_req( /* include additional IE if there is */ lim_send_probe_req_mgmt_frame(mac_ctx, &ssId, session_entry->pLimMlmJoinReq->bssDescription.bssId, - session_entry->currentOperChannel, session_entry->selfMacAddr, + session_entry->currentOperChannel, session_entry->self_mac_addr, session_entry->dot11mode, &session_entry->pLimJoinReq->addIEScan.length, session_entry->pLimJoinReq->addIEScan.addIEdata); 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 c01afb4fd71c..687e5e2a2858 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 @@ -605,7 +605,7 @@ __lim_handle_sme_start_bss_request(struct mac_context *mac_ctx, uint32_t *msg_bu session->ht_config = sme_start_bss_req->ht_config; session->vht_config = sme_start_bss_req->vht_config; - sir_copy_mac_addr(session->selfMacAddr, + sir_copy_mac_addr(session->self_mac_addr, sme_start_bss_req->self_macaddr.bytes); /* Copy SSID to session table */ @@ -1361,8 +1361,8 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf) session->vht_config = sme_join_req->vht_config; /* Copying of bssId is already done, while creating session */ - sir_copy_mac_addr(session->selfMacAddr, - sme_join_req->selfMacAddr); + sir_copy_mac_addr(session->self_mac_addr, + sme_join_req->self_mac_addr); session->bssType = sme_join_req->bsstype; session->statypeForBss = STA_ENTRY_PEER; @@ -4049,7 +4049,7 @@ lim_send_set_max_tx_power_req(struct mac_context *mac, int8_t txPower, qdf_mem_copy(pMaxTxParams->bssId.bytes, pe_session->bssId, QDF_MAC_ADDR_SIZE); qdf_mem_copy(pMaxTxParams->selfStaMacAddr.bytes, - pe_session->selfMacAddr, + pe_session->self_mac_addr, QDF_MAC_ADDR_SIZE); msgQ.type = WMA_SET_MAX_TX_POWER_REQ; diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c index 714101318b83..de53a9122fe3 100644 --- a/core/mac/src/pe/lim/lim_process_tdls.c +++ b/core/mac/src/pe/lim/lim_process_tdls.c @@ -310,7 +310,7 @@ static void populate_dot11f_link_iden(struct mac_context *mac, (uint8_t *) pe_session->bssId, QDF_MAC_ADDR_SIZE); qdf_mem_copy((uint8_t *) initStaAddr, - pe_session->selfMacAddr, QDF_MAC_ADDR_SIZE); + pe_session->self_mac_addr, QDF_MAC_ADDR_SIZE); qdf_mem_copy((uint8_t *) respStaAddr, (uint8_t *) peer_mac.bytes, QDF_MAC_ADDR_SIZE); @@ -905,7 +905,7 @@ static QDF_STATUS lim_send_tdls_dis_rsp_frame(struct mac_context *mac, lim_populate_mac_header(mac, pFrame, SIR_MAC_MGMT_FRAME, SIR_MAC_MGMT_ACTION, peer_mac.bytes, - pe_session->selfMacAddr); + pe_session->self_mac_addr); { tpSirMacMgmtHdr pMacHdr; diff --git a/core/mac/src/pe/lim/lim_send_frames_host_roam.c b/core/mac/src/pe/lim/lim_send_frames_host_roam.c index 0d0031f9196e..e9b844a71238 100644 --- a/core/mac/src/pe/lim/lim_send_frames_host_roam.c +++ b/core/mac/src/pe/lim/lim_send_frames_host_roam.c @@ -354,7 +354,7 @@ void lim_send_reassoc_req_with_ft_ies_mgmt_frame(struct mac_context *mac_ctx, /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(mac_ctx, frame, SIR_MAC_MGMT_FRAME, SIR_MAC_MGMT_REASSOC_REQ, pe_session->limReAssocbssId, - pe_session->selfMacAddr); + pe_session->self_mac_addr); mac_hdr = (tpSirMacMgmtHdr) frame; /* That done, pack the ReAssoc Request: */ status = dot11f_pack_re_assoc_request(mac_ctx, frm, frame + @@ -724,7 +724,7 @@ void lim_send_reassoc_req_mgmt_frame(struct mac_context *mac, /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(mac, pFrame, SIR_MAC_MGMT_FRAME, SIR_MAC_MGMT_REASSOC_REQ, pe_session->limReAssocbssId, - pe_session->selfMacAddr); + pe_session->self_mac_addr); pMacHdr = (tpSirMacMgmtHdr) pFrame; /* That done, pack the Probe Request: */ 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 e1b7044f97c3..688549c9b201 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -735,7 +735,7 @@ lim_send_probe_rsp_mgmt_frame(struct mac_context *mac_ctx, /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(mac_ctx, frame, SIR_MAC_MGMT_FRAME, SIR_MAC_MGMT_PROBE_RSP, peer_macaddr, - pe_session->selfMacAddr); + pe_session->self_mac_addr); mac_hdr = (tpSirMacMgmtHdr) frame; @@ -940,7 +940,7 @@ lim_send_addts_req_action_frame(struct mac_context *mac, /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(mac, pFrame, SIR_MAC_MGMT_FRAME, - SIR_MAC_MGMT_ACTION, peerMacAddr, pe_session->selfMacAddr); + SIR_MAC_MGMT_ACTION, peerMacAddr, pe_session->self_mac_addr); pMacHdr = (tpSirMacMgmtHdr) pFrame; sir_copy_mac_addr(pMacHdr->bssId, pe_session->bssId); @@ -1300,7 +1300,7 @@ lim_send_assoc_rsp_mgmt_frame(struct mac_context *mac_ctx, (LIM_ASSOC == subtype) ? SIR_MAC_MGMT_ASSOC_RSP : SIR_MAC_MGMT_REASSOC_RSP, peer_addr, - pe_session->selfMacAddr); + pe_session->self_mac_addr); mac_hdr = (tpSirMacMgmtHdr) frame; sir_copy_mac_addr(mac_hdr->bssId, pe_session->bssId); @@ -1446,7 +1446,7 @@ lim_send_delts_req_action_frame(struct mac_context *mac, /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(mac, pFrame, SIR_MAC_MGMT_FRAME, - SIR_MAC_MGMT_ACTION, peer, pe_session->selfMacAddr); + SIR_MAC_MGMT_ACTION, peer, pe_session->self_mac_addr); pMacHdr = (tpSirMacMgmtHdr) pFrame; sir_copy_mac_addr(pMacHdr->bssId, pe_session->bssId); @@ -2071,7 +2071,7 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx, /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(mac_ctx, frame, SIR_MAC_MGMT_FRAME, SIR_MAC_MGMT_ASSOC_REQ, pe_session->bssId, - pe_session->selfMacAddr); + pe_session->self_mac_addr); /* That done, pack the Assoc Request: */ status = dot11f_pack_assoc_request(mac_ctx, frm, frame + sizeof(tSirMacMgmtHdr), payload, &payload); @@ -2467,7 +2467,7 @@ alloc_packet: /* Prepare BD */ lim_populate_mac_header(mac_ctx, frame, SIR_MAC_MGMT_FRAME, - SIR_MAC_MGMT_AUTH, peer_addr, session->selfMacAddr); + SIR_MAC_MGMT_AUTH, peer_addr, session->self_mac_addr); mac_hdr = (tpSirMacMgmtHdr) frame; if (wep_challenge_len) mac_hdr->fc.wep = LIM_WEP_IN_FC; @@ -2963,7 +2963,7 @@ lim_send_disassoc_mgmt_frame(struct mac_context *mac, /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(mac, pFrame, SIR_MAC_MGMT_FRAME, - SIR_MAC_MGMT_DISASSOC, peer, pe_session->selfMacAddr); + SIR_MAC_MGMT_DISASSOC, peer, pe_session->self_mac_addr); pMacHdr = (tpSirMacMgmtHdr) pFrame; /* Prepare the BSSID */ @@ -2990,7 +2990,7 @@ lim_send_disassoc_mgmt_frame(struct mac_context *mac, "reason %u and waitForAck %d to " QDF_MAC_ADDR_STR " ,From " QDF_MAC_ADDR_STR, pe_session->peSessionId, nReason, waitForAck, QDF_MAC_ADDR_ARRAY(pMacHdr->da), - QDF_MAC_ADDR_ARRAY(pe_session->selfMacAddr)); + QDF_MAC_ADDR_ARRAY(pe_session->self_mac_addr)); if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) || (pe_session->opmode == QDF_P2P_CLIENT_MODE) || @@ -3144,7 +3144,7 @@ lim_send_deauth_mgmt_frame(struct mac_context *mac, /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(mac, pFrame, SIR_MAC_MGMT_FRAME, - SIR_MAC_MGMT_DEAUTH, peer, pe_session->selfMacAddr); + SIR_MAC_MGMT_DEAUTH, peer, pe_session->self_mac_addr); pMacHdr = (tpSirMacMgmtHdr) pFrame; /* Prepare the BSSID */ @@ -3170,7 +3170,7 @@ lim_send_deauth_mgmt_frame(struct mac_context *mac, " ,From " QDF_MAC_ADDR_STR, pe_session->peSessionId, nReason, waitForAck, QDF_MAC_ADDR_ARRAY(pMacHdr->da), - QDF_MAC_ADDR_ARRAY(pe_session->selfMacAddr)); + QDF_MAC_ADDR_ARRAY(pe_session->self_mac_addr)); if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) || (pe_session->opmode == QDF_P2P_CLIENT_MODE) || @@ -3582,7 +3582,7 @@ lim_send_channel_switch_mgmt_frame(struct mac_context *mac, /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(mac, pFrame, SIR_MAC_MGMT_FRAME, SIR_MAC_MGMT_ACTION, peer, - pe_session->selfMacAddr); + pe_session->self_mac_addr); pMacHdr = (tpSirMacMgmtHdr) pFrame; qdf_mem_copy((uint8_t *) pMacHdr->bssId, (uint8_t *) pe_session->bssId, sizeof(tSirMacAddr)); @@ -3723,7 +3723,7 @@ lim_send_extended_chan_switch_action_frame(struct mac_context *mac_ctx, /* Next, we fill out the buffer descriptor */ lim_populate_mac_header(mac_ctx, frame, SIR_MAC_MGMT_FRAME, - SIR_MAC_MGMT_ACTION, peer, session_entry->selfMacAddr); + SIR_MAC_MGMT_ACTION, peer, session_entry->self_mac_addr); mac_hdr = (tpSirMacMgmtHdr) frame; qdf_mem_copy((uint8_t *) mac_hdr->bssId, (uint8_t *) session_entry->bssId, @@ -3877,7 +3877,7 @@ lim_p2p_oper_chan_change_confirm_action_frame(struct mac_context *mac_ctx, /* Next, fill out the buffer descriptor */ lim_populate_mac_header(mac_ctx, frame, SIR_MAC_MGMT_FRAME, - SIR_MAC_MGMT_ACTION, peer, session_entry->selfMacAddr); + SIR_MAC_MGMT_ACTION, peer, session_entry->self_mac_addr); mac_hdr = (tpSirMacMgmtHdr) frame; qdf_mem_copy((uint8_t *) mac_hdr->bssId, (uint8_t *) session_entry->bssId, @@ -3999,7 +3999,7 @@ lim_send_neighbor_report_request_frame(struct mac_context *mac, /* Copy necessary info to BD */ lim_populate_mac_header(mac, pFrame, SIR_MAC_MGMT_FRAME, - SIR_MAC_MGMT_ACTION, peer, pe_session->selfMacAddr); + SIR_MAC_MGMT_ACTION, peer, pe_session->self_mac_addr); /* Update A3 with the BSSID */ pMacHdr = (tpSirMacMgmtHdr) pFrame; @@ -4144,7 +4144,7 @@ lim_send_link_report_action_frame(struct mac_context *mac, /* Copy necessary info to BD */ lim_populate_mac_header(mac, pFrame, SIR_MAC_MGMT_FRAME, - SIR_MAC_MGMT_ACTION, peer, pe_session->selfMacAddr); + SIR_MAC_MGMT_ACTION, peer, pe_session->self_mac_addr); /* Update A3 with the BSSID */ pMacHdr = (tpSirMacMgmtHdr) pFrame; @@ -4314,7 +4314,7 @@ lim_send_radio_measure_report_action_frame(struct mac_context *mac, /* Copy necessary info to BD */ lim_populate_mac_header(mac, pFrame, SIR_MAC_MGMT_FRAME, - SIR_MAC_MGMT_ACTION, peer, pe_session->selfMacAddr); + SIR_MAC_MGMT_ACTION, peer, pe_session->self_mac_addr); /* Update A3 with the BSSID */ pMacHdr = (tpSirMacMgmtHdr) pFrame; @@ -4445,7 +4445,7 @@ QDF_STATUS lim_send_sa_query_request_frame(struct mac_context *mac, uint8_t *tra /* Copy necessary info to BD */ lim_populate_mac_header(mac, pFrame, SIR_MAC_MGMT_FRAME, - SIR_MAC_MGMT_ACTION, peer, pe_session->selfMacAddr); + SIR_MAC_MGMT_ACTION, peer, pe_session->self_mac_addr); /* Update A3 with the BSSID */ pMacHdr = (tpSirMacMgmtHdr) pFrame; @@ -4476,7 +4476,7 @@ QDF_STATUS lim_send_sa_query_request_frame(struct mac_context *mac, uint8_t *tra pe_debug("Sending an SA Query Request to"); lim_print_mac_addr(mac, peer, LOGD); pe_debug("Sending an SA Query Request from "); - lim_print_mac_addr(mac, pe_session->selfMacAddr, LOGD); + lim_print_mac_addr(mac, pe_session->self_mac_addr, LOGD); if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) #ifdef WLAN_FEATURE_P2P @@ -4578,7 +4578,7 @@ QDF_STATUS lim_send_sa_query_response_frame(struct mac_context *mac, /* Copy necessary info to BD */ lim_populate_mac_header(mac, pFrame, SIR_MAC_MGMT_FRAME, - SIR_MAC_MGMT_ACTION, peer, pe_session->selfMacAddr); + SIR_MAC_MGMT_ACTION, peer, pe_session->self_mac_addr); /* Update A3 with the BSSID */ pMacHdr = (tpSirMacMgmtHdr) pFrame; @@ -4759,7 +4759,7 @@ QDF_STATUS lim_send_addba_response_frame(struct mac_context *mac_ctx, } pe_debug("Sending a ADDBA Response from %pM to %pM", - session->selfMacAddr, peer_mac); + session->self_mac_addr, peer_mac); pe_debug("tid: %d, dialog_token: %d, status: %d, buff_size: %d", tid, frm.DialogToken.token, frm.Status.status, frm.addba_param_set.buff_size); @@ -4790,7 +4790,7 @@ QDF_STATUS lim_send_addba_response_frame(struct mac_context *mac_ctx, qdf_mem_zero(frame_ptr, num_bytes); lim_populate_mac_header(mac_ctx, frame_ptr, SIR_MAC_MGMT_FRAME, - SIR_MAC_MGMT_ACTION, peer_mac, session->selfMacAddr); + SIR_MAC_MGMT_ACTION, peer_mac, session->self_mac_addr); /* Update A3 with the BSSID */ mgmt_hdr = (tpSirMacMgmtHdr) frame_ptr; diff --git a/core/mac/src/pe/lim/lim_send_messages.c b/core/mac/src/pe/lim/lim_send_messages.c index 6c5ae738d352..8daaa9a58096 100644 --- a/core/mac/src/pe/lim/lim_send_messages.c +++ b/core/mac/src/pe/lim/lim_send_messages.c @@ -135,7 +135,7 @@ QDF_STATUS lim_send_switch_chnl_params(struct mac_context *mac, pChnlParams->ch_center_freq_seg0 = ch_center_freq_seg0; pChnlParams->ch_center_freq_seg1 = ch_center_freq_seg1; pChnlParams->ch_width = ch_width; - qdf_mem_copy(pChnlParams->selfStaMacAddr, pe_session->selfMacAddr, + qdf_mem_copy(pChnlParams->selfStaMacAddr, pe_session->self_mac_addr, sizeof(tSirMacAddr)); pChnlParams->maxTxPower = maxTxPower; qdf_mem_copy(pChnlParams->bssId, pe_session->bssId, @@ -362,7 +362,7 @@ void lim_set_active_edca_params(struct mac_context *mac_ctx, \return None -----------------------------------------------------------*/ QDF_STATUS lim_set_link_state(struct mac_context *mac, tSirLinkState state, - tSirMacAddr bssId, tSirMacAddr selfMacAddr, + tSirMacAddr bssId, tSirMacAddr self_mac_addr, tpSetLinkStateCallback callback, void *callbackArg) { @@ -379,7 +379,7 @@ QDF_STATUS lim_set_link_state(struct mac_context *mac, tSirLinkState state, /* Copy Mac address */ sir_copy_mac_addr(pLinkStateParams->bssid, bssId); - sir_copy_mac_addr(pLinkStateParams->selfMacAddr, selfMacAddr); + sir_copy_mac_addr(pLinkStateParams->self_mac_addr, self_mac_addr); msgQ.type = WMA_SET_LINK_STATE; msgQ.reserved = 0; diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c index 4030e0265ba7..ba38f72ed78d 100644 --- a/core/mac/src/pe/lim/lim_session.c +++ b/core/mac/src/pe/lim/lim_session.c @@ -575,7 +575,7 @@ struct pe_session *pe_create_session(struct mac_context *mac, /* Copy the BSSID to the session table */ sir_copy_mac_addr(session_ptr->bssId, bssid); if (bssType == eSIR_MONITOR_MODE) - sir_copy_mac_addr(mac->lim.gpSession[i].selfMacAddr, bssid); + sir_copy_mac_addr(mac->lim.gpSession[i].self_mac_addr, bssid); session_ptr->valid = true; /* Initialize the SME and MLM states to IDLE */ session_ptr->limMlmState = eLIM_MLM_IDLE_STATE; diff --git a/core/mac/src/pe/lim/lim_sme_req_utils.c b/core/mac/src/pe/lim/lim_sme_req_utils.c index 771efb303e83..9f0c07c86440 100644 --- a/core/mac/src/pe/lim/lim_sme_req_utils.c +++ b/core/mac/src/pe/lim/lim_sme_req_utils.c @@ -495,9 +495,9 @@ uint8_t lim_is_sme_join_req_valid(struct mac_context *mac, Reject Join Req if the Self Mac Address and the Ap's Mac Address is same */ - if (!qdf_mem_cmp((uint8_t *) pJoinReq->selfMacAddr, - (uint8_t *) pJoinReq->bssDescription.bssId, - (uint8_t) (sizeof(tSirMacAddr)))) { + if (!qdf_mem_cmp((uint8_t *)pJoinReq->self_mac_addr, + (uint8_t *)pJoinReq->bssDescription.bssId, + (uint8_t) (sizeof(tSirMacAddr)))) { /* Log the event */ pe_err("received SME_JOIN_REQ with Self Mac and BSSID Same"); diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 614adc48609d..087cbc859938 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -4927,7 +4927,7 @@ static void lim_diag_fill_mgmt_event_report(struct mac_context *mac_ctx, qdf_mem_zero(mgmt_event, sizeof(*mgmt_event)); mgmt_event->mgmt_type = mac_hdr->fc.type; mgmt_event->mgmt_subtype = mac_hdr->fc.subType; - qdf_mem_copy(mgmt_event->self_mac_addr, session->selfMacAddr, + qdf_mem_copy(mgmt_event->self_mac_addr, session->self_mac_addr, QDF_MAC_ADDR_SIZE); qdf_mem_copy(mgmt_event->bssid, session->bssId, QDF_MAC_ADDR_SIZE); @@ -5492,7 +5492,7 @@ bool lim_validate_received_frame_a1_addr(struct mac_context *mac_ctx, /* just for fail safe, don't handle MC/BC a1 in this routine */ return true; } - if (qdf_mem_cmp(a1, session->selfMacAddr, 6)) { + if (qdf_mem_cmp(a1, session->self_mac_addr, 6)) { pe_err("Invalid A1 address in received frame"); return false; } @@ -7504,8 +7504,8 @@ struct csr_roam_session *lim_get_session_by_macaddr(struct mac_context *mac_ctx, session = CSR_GET_SESSION(mac_ctx, i); if (!session) continue; - else if (!qdf_mem_cmp(&session->selfMacAddr, - self_mac, sizeof(tSirMacAddr))) { + else if (!qdf_mem_cmp(&session->self_mac_addr, + self_mac, sizeof(tSirMacAddr))) { QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, FL("session %d exists with mac address " diff --git a/core/mac/src/pe/nan/nan_datapath.c b/core/mac/src/pe/nan/nan_datapath.c index 308a18904d97..6ee1dd7e31ed 100644 --- a/core/mac/src/pe/nan/nan_datapath.c +++ b/core/mac/src/pe/nan/nan_datapath.c @@ -420,8 +420,8 @@ void lim_ndi_del_bss_rsp(struct mac_context * mac_ctx, } if (lim_set_link_state(mac_ctx, eSIR_LINK_IDLE_STATE, - session_entry->selfMacAddr, - session_entry->selfMacAddr, NULL, NULL) + session_entry->self_mac_addr, + session_entry->self_mac_addr, NULL, NULL) != QDF_STATUS_SUCCESS) { pe_err("NDI: DEL_BSS_RSP setLinkState failed"); goto end; diff --git a/core/mac/src/pe/rrm/rrm_api.c b/core/mac/src/pe/rrm/rrm_api.c index 667fa3d6e021..86a544e7a30e 100644 --- a/core/mac/src/pe/rrm/rrm_api.c +++ b/core/mac/src/pe/rrm/rrm_api.c @@ -131,7 +131,7 @@ rrm_send_set_max_tx_power_req(struct mac_context *mac, int8_t txPower, qdf_mem_copy(pMaxTxParams->bssId.bytes, pe_session->bssId, QDF_MAC_ADDR_SIZE); qdf_mem_copy(pMaxTxParams->selfStaMacAddr.bytes, - pe_session->selfMacAddr, + pe_session->self_mac_addr, QDF_MAC_ADDR_SIZE); msgQ.type = WMA_SET_MAX_TX_POWER_REQ; diff --git a/core/mac/src/pe/sch/sch_api.c b/core/mac/src/pe/sch/sch_api.c index cc7396c8487d..d22f8c6eb3b5 100644 --- a/core/mac/src/pe/sch/sch_api.c +++ b/core/mac/src/pe/sch/sch_api.c @@ -310,8 +310,8 @@ uint32_t lim_send_probe_rsp_template_to_hal(struct mac_context *mac, /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(mac, pFrame2Hal, SIR_MAC_MGMT_FRAME, SIR_MAC_MGMT_PROBE_RSP, - pe_session->selfMacAddr, - pe_session->selfMacAddr); + pe_session->self_mac_addr, + pe_session->self_mac_addr); pMacHdr = (tpSirMacMgmtHdr) pFrame2Hal; diff --git a/core/mac/src/pe/sch/sch_beacon_gen.c b/core/mac/src/pe/sch/sch_beacon_gen.c index ac1a6c003ee6..35c98bcb906b 100644 --- a/core/mac/src/pe/sch/sch_beacon_gen.c +++ b/core/mac/src/pe/sch/sch_beacon_gen.c @@ -277,8 +277,8 @@ sch_set_fixed_beacon_fields(struct mac_context *mac_ctx, struct pe_session *sess for (i = 0; i < 6; i++) mac->da[i] = 0xff; - qdf_mem_copy(mac->sa, session->selfMacAddr, - sizeof(session->selfMacAddr)); + qdf_mem_copy(mac->sa, session->self_mac_addr, + sizeof(session->self_mac_addr)); qdf_mem_copy(mac->bssId, session->bssId, sizeof(session->bssId)); mac->fc.fromDS = 0; diff --git a/core/mac/src/pe/sch/sch_beacon_process.c b/core/mac/src/pe/sch/sch_beacon_process.c index c6d22b90f0d1..b8ad24346ca7 100644 --- a/core/mac/src/pe/sch/sch_beacon_process.c +++ b/core/mac/src/pe/sch/sch_beacon_process.c @@ -925,7 +925,7 @@ static void __sch_beacon_process_for_session(struct mac_context *mac_ctx, if (sendProbeReq) lim_send_probe_req_mgmt_frame(mac_ctx, &session->ssId, session->bssId, session->currentOperChannel, - session->selfMacAddr, session->dot11mode, NULL, NULL); + session->self_mac_addr, session->dot11mode, NULL, NULL); if ((false == mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running) && beaconParams.paramChangeBitmap) { diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index 5409690d3d39..a226f0bcb430 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -323,7 +323,7 @@ struct wmstatus_changecmd { struct delstafor_sessionCmd { /* Session self mac addr */ - tSirMacAddr selfMacAddr; + tSirMacAddr self_mac_addr; csr_session_close_cb session_close_cb; void *context; }; @@ -578,7 +578,7 @@ struct csr_roam_session { bool sessionActive; /* true if it is used */ /* For BT-AMP station, this serve as BSSID for self-BSS. */ - struct qdf_mac_addr selfMacAddr; + struct qdf_mac_addr self_mac_addr; csr_session_open_cb session_open_cb; csr_session_close_cb session_close_cb; diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index fc18b498caed..b4ee099976a1 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -5494,7 +5494,7 @@ QDF_STATUS sme_8023_multicast_list(mac_handle_t mac_handle, uint8_t sessionId, qdf_mem_copy(request_buf, pMulticastAddrs, sizeof(tSirRcvFltMcAddrList)); - qdf_copy_macaddr(&request_buf->self_macaddr, &pSession->selfMacAddr); + qdf_copy_macaddr(&request_buf->self_macaddr, &pSession->self_mac_addr); qdf_copy_macaddr(&request_buf->bssid, &pSession->connectedProfile.bssid); diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 8a46faad7f92..7fc0ffca3276 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -13046,7 +13046,7 @@ QDF_STATUS csr_process_del_sta_session_command(struct mac_context *mac_ctx, return QDF_STATUS_E_NOMEM; qdf_mem_copy(del_sta_self_req->self_mac_addr, - sme_command->u.delStaSessionCmd.selfMacAddr, + sme_command->u.delStaSessionCmd.self_mac_addr, sizeof(tSirMacAddr)); del_sta_self_req->session_id = sme_command->sessionId; @@ -14245,7 +14245,7 @@ void csr_roam_prepare_bss_params(struct mac_context *mac, uint32_t sessionId, &pSession->bssParams); if (CSR_IS_NDI(pProfile)) { qdf_copy_macaddr(&pSession->bssParams.bssid, - &pSession->selfMacAddr); + &pSession->self_mac_addr); } } else { csr_roam_get_bss_start_parms(mac, pProfile, @@ -15342,7 +15342,8 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId, } else { csr_join_req->ssId.length = 0; } - qdf_mem_copy(&csr_join_req->selfMacAddr, &pSession->selfMacAddr, + qdf_mem_copy(&csr_join_req->self_mac_addr, + &pSession->self_mac_addr, sizeof(tSirMacAddr)); sme_info("Connecting to ssid:%.*s bssid: "QDF_MAC_ADDR_STR" rssi: %d channel: %d country_code: %c%c", csr_join_req->ssId.length, csr_join_req->ssId.ssId, @@ -16172,7 +16173,7 @@ QDF_STATUS csr_send_mb_disassoc_req_msg(struct mac_context *mac, if ((pSession->pCurRoamProfile) && (CSR_IS_INFRA_AP(pSession->pCurRoamProfile))) { qdf_mem_copy(&pMsg->bssid.bytes, - &pSession->selfMacAddr, + &pSession->self_mac_addr, QDF_MAC_ADDR_SIZE); qdf_mem_copy(&pMsg->peer_macaddr.bytes, bssId, @@ -16237,7 +16238,7 @@ QDF_STATUS csr_send_chng_mcc_beacon_interval(struct mac_context *mac, pMsg->messageType = eWNI_SME_CHNG_MCC_BEACON_INTERVAL; pMsg->length = len; - qdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr); + qdf_copy_macaddr(&pMsg->bssid, &pSession->self_mac_addr); sme_debug("CSR Attempting to change BI for Bssid= " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pMsg->bssid.bytes)); @@ -16279,7 +16280,7 @@ QDF_STATUS csr_set_ht2040_mode(struct mac_context *mac, uint32_t sessionId, pMsg->messageType = eWNI_SME_SET_HT_2040_MODE; pMsg->length = len; - qdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr); + qdf_copy_macaddr(&pMsg->bssid, &pSession->self_mac_addr); sme_debug( "CSR Attempting to set HT20/40 mode for Bssid= " QDF_MAC_ADDR_STR, @@ -16316,7 +16317,7 @@ QDF_STATUS csr_send_mb_deauth_req_msg(struct mac_context *mac, if ((pSession->pCurRoamProfile) && (CSR_IS_INFRA_AP(pSession->pCurRoamProfile))) { qdf_mem_copy(&pMsg->bssid, - &pSession->selfMacAddr, + &pSession->self_mac_addr, QDF_MAC_ADDR_SIZE); } else { qdf_mem_copy(&pMsg->bssid, @@ -16560,8 +16561,8 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(struct mac_context *mac, uint32_t pMsg->sessionId = sessionId; pMsg->length = sizeof(*pMsg); qdf_copy_macaddr(&pMsg->bssid, &pParam->bssid); - /* selfMacAddr */ - qdf_copy_macaddr(&pMsg->self_macaddr, &pSession->selfMacAddr); + /* self_mac_addr */ + qdf_copy_macaddr(&pMsg->self_macaddr, &pSession->self_mac_addr); /* beaconInterval */ if (bss_desc && bss_desc->beaconInterval) wTmp = bss_desc->beaconInterval; @@ -17023,7 +17024,7 @@ QDF_STATUS csr_roam_open_session(struct mac_context *mac_ctx, session->callback = session_param->callback; session->pContext = session_param->callback_ctx; - qdf_mem_copy(&session->selfMacAddr, session_param->self_mac_addr, + qdf_mem_copy(&session->self_mac_addr, session_param->self_mac_addr, sizeof(struct qdf_mac_addr)); status = qdf_mc_timer_init(&session->hTimerRoaming, QDF_TIMER_TYPE_SW, @@ -17160,7 +17161,7 @@ csr_issue_del_sta_for_session_req(struct mac_context *mac_ctx, uint32_t session_ sme_command->sessionId = (uint8_t)session_id; sme_command->u.delStaSessionCmd.session_close_cb = callback; sme_command->u.delStaSessionCmd.context = context; - qdf_mem_copy(sme_command->u.delStaSessionCmd.selfMacAddr, + qdf_mem_copy(sme_command->u.delStaSessionCmd.self_mac_addr, session_mac_addr, sizeof(tSirMacAddr)); status = csr_queue_sme_command(mac_ctx, sme_command, false); if (!QDF_IS_STATUS_SUCCESS(status)) @@ -17229,7 +17230,7 @@ QDF_STATUS csr_roam_close_session(struct mac_context *mac_ctx, return QDF_STATUS_E_FAILURE; } status = csr_issue_del_sta_for_session_req(mac_ctx, - session_id, session->selfMacAddr.bytes, + session_id, session->self_mac_addr.bytes, session->session_close_cb, NULL); return status; } @@ -17255,7 +17256,7 @@ static void csr_init_session(struct mac_context *mac, uint32_t sessionId) csr_roam_free_connected_info(mac, &pSession->prev_assoc_ap_info); csr_free_connect_bss_desc(mac, sessionId); - qdf_mem_zero(&pSession->selfMacAddr, sizeof(struct qdf_mac_addr)); + qdf_mem_zero(&pSession->self_mac_addr, sizeof(struct qdf_mac_addr)); if (pSession->pWpaRsnReqIE) { qdf_mem_free(pSession->pWpaRsnReqIE); pSession->pWpaRsnReqIE = NULL; diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index e729740329c5..75e919c6d77e 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -1365,7 +1365,7 @@ QDF_STATUS csr_scan_for_ssid(struct mac_context *mac_ctx, uint32_t session_id, vdev = wlan_objmgr_get_vdev_by_macaddr_from_psoc(mac_ctx->psoc, pdev_id, - session->selfMacAddr.bytes, + session->self_mac_addr.bytes, WLAN_LEGACY_SME_ID); ucfg_scan_init_default_params(vdev, req); req->scan_req.scan_id = scan_id; diff --git a/core/sme/src/csr/csr_roam_preauth.c b/core/sme/src/csr/csr_roam_preauth.c index cac739cc9e16..c18bdf2b421e 100644 --- a/core/sme/src/csr/csr_roam_preauth.c +++ b/core/sme/src/csr/csr_roam_preauth.c @@ -553,7 +553,7 @@ QDF_STATUS csr_roam_issue_ft_preauth_req(struct mac_context *mac_ctx, qdf_mem_copy((void *)&preauth_req->preAuthbssId, (void *)bss_desc->bssId, sizeof(tSirMacAddr)); qdf_mem_copy((void *)&preauth_req->self_mac_addr, - (void *)&csr_session->selfMacAddr.bytes, sizeof(tSirMacAddr)); + (void *)&csr_session->self_mac_addr.bytes, sizeof(tSirMacAddr)); if (csr_roam_is11r_assoc(mac_ctx, session_id) && (mac_ctx->roam.roamSession[session_id].connectedProfile.AuthType != diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h index 335db5efd7f7..33f1fa2f8041 100644 --- a/core/wma/inc/wma_if.h +++ b/core/wma/inc/wma_if.h @@ -369,7 +369,7 @@ typedef struct sLimMlmSetKeysReq { /** * struct tAddBssParams - parameters required for add bss params * @bssId: MAC Address/BSSID - * @selfMacAddr: Self Mac Address + * @self_mac_addr: Self Mac Address * @bssType: BSS type * @operMode: AP - 0; STA - 1; * @nwType: network type @@ -420,7 +420,7 @@ typedef struct sLimMlmSetKeysReq { */ typedef struct { tSirMacAddr bssId; - tSirMacAddr selfMacAddr; + tSirMacAddr self_mac_addr; enum bss_type bssType; uint8_t operMode; tSirNwType nwType; @@ -790,7 +790,7 @@ typedef void (*tpSetLinkStateCallback)(struct mac_context *mac, void *msgParam, /** * struct tLinkStateParams - link state parameters * @bssid: BSSID - * @selfMacAddr: self mac address + * @self_mac_addr: self mac address * @state: link state * @callback: callback function pointer * @callbackArg: callback argument @@ -799,7 +799,7 @@ typedef void (*tpSetLinkStateCallback)(struct mac_context *mac, void *msgParam, typedef struct sLinkStateParams { /* SIR_HAL_SET_LINK_STATE */ tSirMacAddr bssid; - tSirMacAddr selfMacAddr; + tSirMacAddr self_mac_addr; tSirLinkState state; tpSetLinkStateCallback callback; void *callbackArg; diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index 031e2bbbd52e..35815614e24b 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -1192,7 +1192,7 @@ void wma_set_linkstate(tp_wma_handle wma, tpLinkStateParams params) params->status = true; WMA_LOGD("%s: state %d selfmac %pM", __func__, - params->state, params->selfMacAddr); + params->state, params->self_mac_addr); if ((params->state != eSIR_LINK_PREASSOC_STATE) && (params->state != eSIR_LINK_DOWN_STATE)) { WMA_LOGD("%s: unsupported link state %d", @@ -1207,10 +1207,10 @@ void wma_set_linkstate(tp_wma_handle wma, tpLinkStateParams params) goto out; } - vdev = wma_find_vdev_by_addr(wma, params->selfMacAddr, &vdev_id); + vdev = wma_find_vdev_by_addr(wma, params->self_mac_addr, &vdev_id); if (!vdev) { WMA_LOGP("%s: vdev not found for addr: %pM", - __func__, params->selfMacAddr); + __func__, params->self_mac_addr); params->status = false; goto out; } diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 5c4c44dd9a7a..915c501ce222 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -3698,7 +3698,7 @@ void wma_hold_req_timer(void *data) params->status = QDF_STATUS_E_TIMEOUT; WMA_LOGA(FL("WMA_ADD_BSS_REQ timed out")); WMA_LOGD(FL("Sending add bss rsp to umac (mac:%pM, status:%d)"), - params->selfMacAddr, params->status); + params->self_mac_addr, params->status); if (wma_crash_on_fw_timeout(wma->fw_timeout_crash)) wma_trigger_recovery_assert_on_fw_timeout( WMA_ADD_BSS_REQ); @@ -4461,7 +4461,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) struct policy_mgr_hw_mode_params hw_mode = {0}; void *soc = cds_get_context(QDF_MODULE_ID_SOC); - vdev = wma_find_vdev_by_addr(wma, add_bss->selfMacAddr, &vdev_id); + vdev = wma_find_vdev_by_addr(wma, add_bss->self_mac_addr, &vdev_id); if (!vdev) { WMA_LOGE("%s: vdev not found for vdev id %d.", __func__, vdev_id); @@ -4477,7 +4477,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) wma_set_bss_rate_flags(wma, vdev_id, add_bss); /* create ibss bss peer */ - status = wma_create_peer(wma, pdev, vdev, add_bss->selfMacAddr, + status = wma_create_peer(wma, pdev, vdev, add_bss->self_mac_addr, WMI_PEER_TYPE_DEFAULT, vdev_id, false); if (status != QDF_STATUS_SUCCESS) { @@ -4485,13 +4485,13 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) goto send_fail_resp; } WMA_LOGA("IBSS BSS peer created with mac %pM", - add_bss->selfMacAddr); + add_bss->self_mac_addr); peer = cdp_peer_find_by_addr(soc, pdev, - add_bss->selfMacAddr, &peer_id); + add_bss->self_mac_addr, &peer_id); if (!peer) { WMA_LOGE("%s Failed to find peer %pM", __func__, - add_bss->selfMacAddr); + add_bss->self_mac_addr); goto send_fail_resp; } diff --git a/core/wma/src/wma_nan_datapath.c b/core/wma/src/wma_nan_datapath.c index 1e3944d0d6a4..8c6d8edce8f1 100644 --- a/core/wma/src/wma_nan_datapath.c +++ b/core/wma/src/wma_nan_datapath.c @@ -69,17 +69,18 @@ void wma_add_bss_ndi_mode(tp_wma_handle wma, tpAddBssParams add_bss) wma_set_bss_rate_flags(wma, vdev_id, add_bss); - status = wma_create_peer(wma, pdev, vdev, add_bss->selfMacAddr, + status = wma_create_peer(wma, pdev, vdev, add_bss->self_mac_addr, WMI_PEER_TYPE_DEFAULT, vdev_id, false); if (QDF_IS_STATUS_ERROR(status)) { WMA_LOGE("%s: Failed to create peer", __func__); goto send_fail_resp; } - peer = cdp_peer_find_by_addr(soc, pdev, add_bss->selfMacAddr, &peer_id); + peer = cdp_peer_find_by_addr(soc, pdev, add_bss->self_mac_addr, + &peer_id); if (!peer) { WMA_LOGE("%s Failed to find peer %pM", __func__, - add_bss->selfMacAddr); + add_bss->self_mac_addr); goto send_fail_resp; } diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 96aa136ea2b3..ac8104d9ca07 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -2640,8 +2640,8 @@ wma_roam_update_vdev(tp_wma_handle wma, qdf_mem_copy(del_bss_params->bssid, wma->interfaces[vdev_id].bssid, QDF_MAC_ADDR_SIZE); set_link_params->state = eSIR_LINK_PREASSOC_STATE; - qdf_mem_copy(set_link_params->selfMacAddr, - roam_synch_ind_ptr->self_mac.bytes, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(set_link_params->self_mac_addr, + roam_synch_ind_ptr->self_mac.bytes, QDF_MAC_ADDR_SIZE); qdf_mem_copy(set_link_params->bssid, roam_synch_ind_ptr->bssid.bytes, QDF_MAC_ADDR_SIZE); add_sta_params->staType = STA_ENTRY_SELF;