From 9a243e8054c642cd102c278df4261f7fa747086e Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Fri, 23 Aug 2019 10:11:24 +0530 Subject: [PATCH] qcacld-3.0: Remove unused set link states and functions Set link state is not used now so remove unused set link states and functions. Change-Id: Idb1a40922b8a27a18864d7047983d456cc05bffa CRs-fixed: 2514158 --- core/mac/src/include/sir_params.h | 4 --- core/mac/src/pe/lim/lim_ibss_peer_mgmt.c | 9 ------ .../src/pe/lim/lim_process_assoc_rsp_frame.c | 20 ------------ .../src/pe/lim/lim_process_mlm_req_messages.c | 3 +- .../src/pe/lim/lim_process_mlm_rsp_messages.c | 31 ------------------- core/mac/src/pe/nan/nan_datapath.c | 8 ----- core/wma/inc/wma.h | 4 ++- core/wma/src/wma_dev_if.c | 8 ++--- core/wma/src/wma_scan_roam.c | 18 ++--------- 9 files changed, 11 insertions(+), 94 deletions(-) diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h index 9d61fc93aed4..74722efc700e 100644 --- a/core/mac/src/include/sir_params.h +++ b/core/mac/src/include/sir_params.h @@ -140,10 +140,6 @@ enum cap_bitmap { typedef enum eSriLinkState { eSIR_LINK_IDLE_STATE = 0, eSIR_LINK_PREASSOC_STATE = 1, - eSIR_LINK_POSTASSOC_STATE = 2, - eSIR_LINK_AP_STATE = 3, - eSIR_LINK_IBSS_STATE = 4, - eSIR_LINK_DOWN_STATE = 5, } tSirLinkState; /* / Mailbox Message Structure Define */ 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 6544cc650eb9..392acd11539d 100644 --- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c +++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c @@ -1271,7 +1271,6 @@ void lim_ibss_del_bss_rsp(struct mac_context *mac, void *msg, struct pe_session { tSirResultCodes rc = eSIR_SME_SUCCESS; struct del_bss_param *pDelBss = (struct del_bss_param *)msg; - tSirMacAddr nullBssid = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; SET_LIM_PROCESS_DEFD_MESGS(mac, true); if (!pDelBss) { @@ -1304,14 +1303,6 @@ void lim_ibss_del_bss_rsp(struct mac_context *mac, void *msg, struct pe_session goto end; } - if (lim_set_link_state(mac, eSIR_LINK_IDLE_STATE, nullBssid, - pe_session->self_mac_addr, NULL, - NULL) != QDF_STATUS_SUCCESS) { - pe_err("IBSS: DEL_BSS_RSP setLinkState failed"); - rc = eSIR_SME_REFUSED; - goto end; - } - lim_ibss_delete(mac, pe_session); dph_hash_table_init(mac, &pe_session->dph.dphHashTable); 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 d42177c801a6..2fbf98462f55 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 @@ -834,26 +834,6 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, goto assocReject; } - /* - * Association Response received with success code - * Set the link state to POSTASSOC now that we have received - * assoc/reassoc response - * NOTE: for BTAMP case, it is being handled in - * lim_process_mlm_assoc_req - */ - if (!lim_is_roam_synch_in_progress(session_entry)) { - if (lim_set_link_state - (mac_ctx, eSIR_LINK_POSTASSOC_STATE, - session_entry->bssId, - session_entry->self_mac_addr, NULL, - NULL) != QDF_STATUS_SUCCESS) { - pe_err("Set link state to POSTASSOC failed"); - qdf_mem_free(beacon); - qdf_mem_free(assoc_rsp); - return; - } - } - if (assoc_rsp->QosMapSet.present) qdf_mem_copy(&session_entry->QosMapSet, &assoc_rsp->QosMapSet, 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 6fd4e73b3754..67d4698de8ca 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 @@ -639,7 +639,8 @@ lim_process_mlm_post_join_suspend_link(struct mac_context *mac_ctx, mac_ctx->lim.limTimers.gLimJoinFailureTimer.sessionId = session->peSessionId; - status = wma_add_bss_peer_sta(session->self_mac_addr, session->bssId); + status = wma_add_bss_peer_sta(session->self_mac_addr, session->bssId, + false); lim_post_join_set_link_state_callback(mac_ctx, session, status); return; 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 1ab8cf5fd211..b0e752ea884c 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 @@ -1594,14 +1594,6 @@ void lim_process_sta_mlm_del_bss_rsp(struct mac_context *mac, } if (QDF_STATUS_SUCCESS == pDelBssParams->status) { pe_debug("STA received the DEL_BSS_RSP"); - if (lim_set_link_state - (mac, eSIR_LINK_IDLE_STATE, pe_session->bssId, - pe_session->self_mac_addr, NULL, - NULL) != QDF_STATUS_SUCCESS) { - pe_err("Failure in setting link state to IDLE"); - status_code = eSIR_SME_REFUSED; - goto end; - } if (!sta) { pe_err("DPH Entry for STA 1 missing"); status_code = eSIR_SME_REFUSED; @@ -1649,8 +1641,6 @@ void lim_process_ap_mlm_del_bss_rsp(struct mac_context *mac, struct pe_session *pe_session) { tSirResultCodes rc = eSIR_SME_SUCCESS; - QDF_STATUS status; - tSirMacAddr nullBssid = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; if (!pe_session) { pe_err("Session entry passed is NULL"); @@ -1681,12 +1671,6 @@ void lim_process_ap_mlm_del_bss_rsp(struct mac_context *mac, rc = eSIR_SME_STOP_BSS_FAILURE; goto end; } - status = lim_set_link_state(mac, eSIR_LINK_IDLE_STATE, nullBssid, - pe_session->self_mac_addr, NULL, NULL); - if (status != QDF_STATUS_SUCCESS) { - rc = eSIR_SME_REFUSED; - goto end; - } /** Softmac may send all the buffered packets right after resuming the transmission hence * to occupy the medium during non channel occupancy period. So resume the transmission after * HAL gives back the response. @@ -2031,11 +2015,6 @@ static void lim_process_ap_mlm_add_bss_rsp(struct mac_context *mac, mlmStartCnf.sessionId = pAddBssParams->sessionId; if (QDF_STATUS_SUCCESS == pAddBssParams->status) { 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->self_mac_addr, NULL, - NULL) != QDF_STATUS_SUCCESS) - return; /* Set MLME state */ pe_session->limMlmState = eLIM_MLM_BSS_STARTED_STATE; pe_session->chainMask = pAddBssParams->chainMask; @@ -2150,11 +2129,6 @@ lim_process_ibss_mlm_add_bss_rsp(struct mac_context *mac, if (QDF_STATUS_SUCCESS == pAddBssParams->status) { pe_debug("WMA_ADD_BSS_RSP returned with QDF_STATUS_SUCCESS"); - if (lim_set_link_state - (mac, eSIR_LINK_IBSS_STATE, pe_session->bssId, - pe_session->self_mac_addr, NULL, - NULL) != QDF_STATUS_SUCCESS) - return; /* Set MLME state */ pe_session->limMlmState = eLIM_MLM_BSS_STARTED_STATE; MTRACE(mac_trace @@ -2449,11 +2423,6 @@ static void lim_process_sta_mlm_add_bss_rsp(struct mac_context *mac_ctx, if (mlm_assoc_cnf.resultCode != eSIR_SME_SUCCESS) { session_entry->limMlmState = eLIM_MLM_IDLE_STATE; - if (lim_set_link_state(mac_ctx, eSIR_LINK_IDLE_STATE, - session_entry->bssId, - session_entry->self_mac_addr, - NULL, NULL) != QDF_STATUS_SUCCESS) - pe_err("Failed to set the LinkState"); /* Update PE session Id */ mlm_assoc_cnf.sessionId = session_entry->peSessionId; lim_post_sme_message(mac_ctx, msg_type, diff --git a/core/mac/src/pe/nan/nan_datapath.c b/core/mac/src/pe/nan/nan_datapath.c index 35e1e53c1da3..2b4703131cc1 100644 --- a/core/mac/src/pe/nan/nan_datapath.c +++ b/core/mac/src/pe/nan/nan_datapath.c @@ -406,14 +406,6 @@ void lim_ndi_del_bss_rsp(struct mac_context * mac_ctx, goto end; } - if (lim_set_link_state(mac_ctx, eSIR_LINK_IDLE_STATE, - 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; - } - session_entry->limMlmState = eLIM_MLM_IDLE_STATE; end: diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 589d483755f2..74a5c495287b 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -2568,10 +2568,12 @@ int wma_motion_det_base_line_host_event_handler(void *handle, u_int8_t *event, * wma_add_bss_peer_sta() - creat bss peer when sta connect * @self_mac: self mac address * @bssid: AP bssid + * @roam_sync: if roam sync is in progress * * Return: 0 on success, else error on failure */ -QDF_STATUS wma_add_bss_peer_sta(uint8_t *self_mac, uint8_t *bssid); +QDF_STATUS wma_add_bss_peer_sta(uint8_t *self_mac, uint8_t *bssid, + bool roam_sync); /** * wma_send_vdev_stop() - WMA api to send vdev stop to fw diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 49b799a50bcb..ac9ad98d2146 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -6002,7 +6002,8 @@ QDF_STATUS wma_set_wlm_latency_level(void *wma_ptr, return ret; } -QDF_STATUS wma_add_bss_peer_sta(uint8_t *self_mac, uint8_t *bssid) +QDF_STATUS wma_add_bss_peer_sta(uint8_t *self_mac, uint8_t *bssid, + bool roam_synch) { struct cdp_pdev *pdev; struct cdp_vdev *vdev; @@ -6021,9 +6022,8 @@ QDF_STATUS wma_add_bss_peer_sta(uint8_t *self_mac, uint8_t *bssid) WMA_LOGE("vdev not found for addr: %pM", self_mac); goto err; } - status = wma_create_peer( - wma, pdev, vdev, bssid, - WMI_PEER_TYPE_DEFAULT, vdev_id, false); + status = wma_create_peer(wma, pdev, vdev, bssid, WMI_PEER_TYPE_DEFAULT, + vdev_id, roam_synch); err: return status; } diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index d7f501590a48..0f09e89ae3f0 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -2624,7 +2624,6 @@ wma_roam_update_vdev(tp_wma_handle wma, { struct del_bss_param *del_bss_params; tDeleteStaParams *del_sta_params; - tLinkStateParams *set_link_params; tAddStaParams *add_sta_params; uint32_t uc_cipher = 0, cipher_cap = 0; uint8_t vdev_id; @@ -2641,34 +2640,21 @@ wma_roam_update_vdev(tp_wma_handle wma, return; } - set_link_params = qdf_mem_malloc(sizeof(*set_link_params)); - if (!set_link_params) { - qdf_mem_free(del_bss_params); - qdf_mem_free(del_sta_params); - return; - } add_sta_params = qdf_mem_malloc(sizeof(*add_sta_params)); if (!add_sta_params) { qdf_mem_free(del_bss_params); qdf_mem_free(del_sta_params); - qdf_mem_free(set_link_params); return; } qdf_mem_zero(del_bss_params, sizeof(*del_bss_params)); qdf_mem_zero(del_sta_params, sizeof(*del_sta_params)); - qdf_mem_zero(set_link_params, sizeof(*set_link_params)); qdf_mem_zero(add_sta_params, sizeof(*add_sta_params)); del_bss_params->vdev_id = vdev_id; del_sta_params->smesessionId = vdev_id; 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->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; add_sta_params->smesessionId = vdev_id; qdf_mem_copy(&add_sta_params->bssId, &roam_synch_ind_ptr->bssid.bytes, @@ -2685,7 +2671,8 @@ wma_roam_update_vdev(tp_wma_handle wma, wma_delete_sta(wma, del_sta_params); wma_delete_bss(wma, del_bss_params); - wma_set_linkstate(wma, set_link_params); + wma_add_bss_peer_sta(roam_synch_ind_ptr->self_mac.bytes, + roam_synch_ind_ptr->bssid.bytes, true); /* Update new peer's uc cipher */ wma_update_roamed_peer_unicast_cipher(wma, uc_cipher, cipher_cap, roam_synch_ind_ptr->bssid.bytes); @@ -2694,7 +2681,6 @@ wma_roam_update_vdev(tp_wma_handle wma, qdf_mem_copy(wma->interfaces[vdev_id].bssid, roam_synch_ind_ptr->bssid.bytes, QDF_MAC_ADDR_SIZE); qdf_mem_free(del_bss_params); - qdf_mem_free(set_link_params); qdf_mem_free(add_sta_params); }