From 9153db781e0a6df1837e11215b7190aeb5ca7fc7 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sat, 17 Nov 2018 23:18:13 -0800 Subject: [PATCH] qcacld-3.0: Remove lim_process_del_ts_ind() Function lim_process_del_ts_ind() is an obsolete remnant from a prior version of the driver where Traffic Specification handling was performed on the host. Since this is now handled in firmware, remove the obsolete function. Change-Id: I73155702fa0d034e3d7ffa81bef9bb1160a44ce5 CRs-Fixed: 2353427 --- .../src/pe/lim/lim_process_message_queue.c | 3 - core/mac/src/pe/lim/lim_utils.c | 100 ------------------ core/mac/src/pe/lim/lim_utils.h | 6 -- 3 files changed, 109 deletions(-) diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index 57474da93f..e56e97b41b 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -1745,9 +1745,6 @@ static void lim_process_messages(tpAniSirGlobal mac_ctx, case WMA_ADD_TS_RSP: lim_process_hal_add_ts_rsp(mac_ctx, msg); break; - case SIR_LIM_DEL_TS_IND: - lim_process_del_ts_ind(mac_ctx, msg); - break; case SIR_LIM_BEACON_GEN_IND: if (mac_ctx->lim.gLimSystemRole != eLIM_AP_ROLE) sch_process_pre_beacon_ind(mac_ctx, diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 85f3fe31ad..25e39f677a 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -4276,106 +4276,6 @@ lim_validate_delts_req(tpAniSirGlobal mac_ctx, tpSirDeltsReq delts_req, return QDF_STATUS_SUCCESS; } -/** - * lim_process_del_ts_ind() - handle del_ts_ind from HAL - * - * @mac_ctx: pointer to Global Mac Structure - * @lim_msg: pointer to msg buff - * - * handles the DeleteTS indication coming from HAL or generated by PE itself - * in some error cases. Validates the request, sends the DelTs action frame - * to the Peer and sends DelTs indicatoin to HDD. - * - * Return: none - */ -void lim_process_del_ts_ind(tpAniSirGlobal pMac, struct scheduler_msg *limMsg) -{ - tpDphHashNode pSta; - tpDelTsParams pDelTsParam = (tpDelTsParams) (limMsg->bodyptr); - tpSirDeltsReq pDelTsReq = NULL; - tSirMacAddr peerMacAddr; - tpSirDeltsReqInfo pDelTsReqInfo; - tpLimTspecInfo pTspecInfo; - tpPESession psessionEntry; - uint8_t sessionId; - - psessionEntry = pe_find_session_by_bssid(pMac, pDelTsParam->bssId, - &sessionId); - if (psessionEntry == NULL) { - pe_err("session does not exist for given BssId"); - qdf_mem_free(limMsg->bodyptr); - limMsg->bodyptr = NULL; - return; - } - - pTspecInfo = &(pMac->lim.tspecInfo[pDelTsParam->tspecIdx]); - if (pTspecInfo->inuse == false) { - pe_err("tspec entry with index: %d is not in use", - pDelTsParam->tspecIdx); - goto error1; - } - - pSta = - dph_get_hash_entry(pMac, pTspecInfo->assocId, - &psessionEntry->dph.dphHashTable); - if (pSta == NULL) { - pe_err("Could not find entry in DPH table for assocId: %d", - pTspecInfo->assocId); - goto error1; - } - - pDelTsReq = qdf_mem_malloc(sizeof(tSirDeltsReq)); - if (!pDelTsReq) - goto error1; - - if (pSta->wmeEnabled) - qdf_mem_copy(&(pDelTsReq->req.tspec), &(pTspecInfo->tspec), - sizeof(tSirMacTspecIE)); - else - qdf_mem_copy(&(pDelTsReq->req.tsinfo), - &(pTspecInfo->tspec.tsinfo), - sizeof(tSirMacTSInfo)); - - /* validate the req */ - if (QDF_STATUS_SUCCESS != - lim_validate_delts_req(pMac, pDelTsReq, peerMacAddr, psessionEntry)) { - pe_err("lim_validate_delts_req failed"); - goto error2; - } - pe_debug("Sent DELTS request to station with " - "assocId = %d MacAddr = " MAC_ADDRESS_STR, - pDelTsReq->aid, MAC_ADDR_ARRAY(peerMacAddr)); - - lim_send_delts_req_action_frame(pMac, peerMacAddr, - pDelTsReq->req.wmeTspecPresent, - &pDelTsReq->req.tsinfo, - &pDelTsReq->req.tspec, psessionEntry); - - /* prepare and send an sme indication to HDD */ - pDelTsReqInfo = qdf_mem_malloc(sizeof(tSirDeltsReqInfo)); - if (!pDelTsReqInfo) - goto error3; - - if (pSta->wmeEnabled) - qdf_mem_copy(&(pDelTsReqInfo->tspec), &(pTspecInfo->tspec), - sizeof(tSirMacTspecIE)); - else - qdf_mem_copy(&(pDelTsReqInfo->tsinfo), - &(pTspecInfo->tspec.tsinfo), - sizeof(tSirMacTSInfo)); - - lim_send_sme_delts_ind(pMac, pDelTsReqInfo, pDelTsReq->aid, psessionEntry); - -error3: - qdf_mem_free(pDelTsReqInfo); -error2: - qdf_mem_free(pDelTsReq); -error1: - qdf_mem_free(limMsg->bodyptr); - limMsg->bodyptr = NULL; - return; -} - /** * @function : lim_post_sm_state_update() * diff --git a/core/mac/src/pe/lim/lim_utils.h b/core/mac/src/pe/lim/lim_utils.h index c850a6ccd7..929980ff32 100644 --- a/core/mac/src/pe/lim/lim_utils.h +++ b/core/mac/src/pe/lim/lim_utils.h @@ -432,12 +432,6 @@ void lim_util_count_sta_del(tpAniSirGlobal pMac, tpDphHashNode pSta, uint8_t lim_get_ht_capability(tpAniSirGlobal, uint32_t, tpPESession); QDF_STATUS lim_tx_complete(void *context, qdf_nbuf_t buf, bool free); -/** - * This function will be registered with HAL for callback when TSPEC inactivity - * timer fires. - */ - -void lim_process_del_ts_ind(tpAniSirGlobal pMac, struct scheduler_msg *limMsg); QDF_STATUS lim_validate_delts_req(tpAniSirGlobal pMac, tpSirDeltsReq pDeltsReq, tSirMacAddr peerMacAddr,