From 5ee9ce4e2e2af88d0b6df8f0f11003c84008182c Mon Sep 17 00:00:00 2001 From: Krunal Soni Date: Thu, 15 Mar 2018 15:19:08 -0700 Subject: [PATCH] qcacld-3.0: Remove dead code in protocol stack Remove dead code in protocol stack. Change-Id: I366705b8cf4cf13c030a6456c21dae94193d0d77 CRs-Fixed: 2216008 --- core/mac/inc/sir_types.h | 126 +----------------------------- core/sme/inc/sme_api.h | 9 --- core/sme/src/common/sme_api.c | 22 ------ core/sme/src/csr/csr_api_roam.c | 15 ---- core/sme/src/csr/csr_inside_api.h | 1 - 5 files changed, 3 insertions(+), 170 deletions(-) diff --git a/core/mac/inc/sir_types.h b/core/mac/inc/sir_types.h index 9580745ebb5f..c67f76fdab3b 100644 --- a/core/mac/inc/sir_types.h +++ b/core/mac/inc/sir_types.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016,2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -74,135 +74,15 @@ typedef void *tHddHandle; typedef enum eSirRetStatus { eSIR_SUCCESS, eSIR_FAILURE, - - /* / System Errors */ - eSIR_SYS_ERROR_BASE = 0x100, - eSIR_SYS_TX_THREAD_CREATE_FAILED, - eSIR_SYS_TX_THREAD_RESUME_FAILED, - eSIR_SYS_TX_MSG_Q_CREATE_FAILED, - eSIR_SYS_TX_Q_SEND_FAILED, - eSIR_SYS_TX_Q_RECV_FAILED, - eSIR_SYS_TX_TIMER_ACTIVATE_FAILED, - eSIR_SYS_TX_TIMER_CHANGE_FAILED, - eSIR_SYS_TX_TIMER_CREATE_FAILED, eSIR_MEM_ALLOC_FAILED, - eSIR_PCI_ERROR, - - /* Driver Return Codes */ - eSIR_HAL_ERROR_BASE = 0x1000, - eSIR_HAL_STAID_INVALID, /* 1 */ - eSIR_HAL_TCDESC_INVALID, /* 2 */ - eSIR_HAL_TX_WQ_NOT_VALID, /* 3 */ - eSIR_HAL_PREV_BMU_CMD_INCOMPLETE, /* 4 */ - eSIR_HAL_EEPROM_CRC_FAILED, /* 5 */ - eSIR_HAL_PCI_REVID_INVALID, /* 6 */ - eSIR_HAL_STA_TC_ID_INVALID, /* 7 */ - eSIR_HAL_TXWQ_EMPTY, /* 8 */ - eSIR_HAL_ROUT_TBL_TYPE_STYPE_INVALID, /* 9 */ - eSIR_HAL_TFP_ENABLE_FAILED, /* a */ - eSIR_HAL_TFP_ABORT_CMD_FAILED, /* b */ - eSIR_HAL_TFP_TEMPL_BCNLEN_INVALID, /* c */ - eSIR_HAL_TFP_TEMPL_SCHLEN_INVALID, /* d */ - eSIR_HAL_TFP_TEMPL_CFENDLEN_INVALID, /* e */ - eSIR_HAL_TFP_TEMPL_RRLEN_INVALID, /* f */ - eSIR_HAL_TFP_TEMPL_PSPOLLLEN_INVALID, /* 10 */ - eSIR_HAL_TFP_TEMPL_CTSLEN_INVALID, /* 11 */ - eSIR_HAL_TFP_TEMPL_CFPOLLLEN_INVALID, /* 12 */ - eSIR_HAL_TFP_TEMPL_BACKLEN_INVALID, /* 13 */ - eSIR_HAL_INPUT_INVALID, /* 14 */ - eSIR_HAL_GET_PDU_FAILED, /* 15 */ - eSIR_HAL_ADD_STA_ACK_POLICY_INVALID, /* 16 */ - eSIR_HAL_STA_EXISTS, /* 17 */ - eSIR_HAL_STA_DOES_NOT_EXIST, /* 18 */ - eSIR_HAL_MASTER_WQ_ID_INVALID, /* 19 */ - eSIR_HAL_WQ_NOT_EMPTY, /* 1a */ - eSIR_HAL_WQ_EMPTY, /* 1b */ - eSIR_HAL_PDUCNT_AND_NEXTPTR_MISMATCH, /* 1c */ - eSIR_HAL_ERR_NUM_BYTES_TO_BE_SET_TOO_BIG, /* 1d */ - eSIR_HAL_GET_PKT_LENGTH_INVALID, /* 1e */ - eSIR_HAL_AS_CNT_INVALID, /* 1f */ - eSIR_HAL_RFP_AGE_CMD_SEQFAIL, /* 20 */ - eSIR_HAL_RFP_AGE_CMD_AGE_CMD_TCFAIL, /* 21 */ - eSIR_HAL_RFP_AGE_CMD_PASS, /* 22 */ - eSIR_HAL_RFP_AGE_CMD_TIMEDOUT, /* 23 */ - eSIR_HAL_RHP_HASH_CMD_TIMEOUT, /* 24 */ - eSIR_HAL_RHP_ROUTING_TBL_SET_FAILED, /* 25 */ - eSIR_HAL_RHP_ROUTING_TBL_GET_FAILED, /* 26 */ - - eSIR_HAL_CAL_STATUS_CHK_FAILED, - - eSIR_HAL_SYS_ARM_DBG_MODE_SET_FAILED, - eSIR_HAL_TFP_BCN_SENT, - eSIR_HAL_TFP_BCN_NOT_SENT, - eSIR_HAL_TFP_BKOF_ID_INVALID, - eSIR_HAL_TFP_CFB_ENABLE_INPUT_INVALID, - eSIR_HAL_TFP_EDCF_TXOP_INVALID, - eSIR_HAL_TFP_TEMPL_LEN_INVALID, - eSIR_HAL_KEY_ID_INVALID, - eSIR_HAL_KEY_LEN_INVALID, - eSIR_HAL_CHID_INVALID, - eSIR_HAL_HIF_BURST_READ_FAILED, - eSIR_HAL_HIF_BURST_WRITE_FAILED, - eSIR_HAL_HIF_BURST_LEN_REQ_INVALID, - eSIR_HAL_HIF_TX_NO_FRAG_DESC, - - eSIR_HAL_INVALID_PRODUCT_ID, /* 44 */ - - eSIR_HAL_INVALID_CAPABILITY, /* 48 */ - eSIR_HAL_CB_NOT_ENABLED, /* 49 */ - eSIR_HAL_MAC_RATE_INVALID, /* 4a */ - eSIR_HAL_RHP_HANG, /* 4b */ - eSIR_HAL_UNSUPPORTED, /* 4c */ - eSIR_HAL_TSPEC_INVALID, /* 4d */ - - /* NIM Return Codes */ - eSIR_NIM_ERROR_BASE = 0x2000, - eSIR_NIM_ERR_INVALID_EVENT, - - /* MMH Return Codes */ - eSIR_NIM_MMH_ERROR_BASE = 0x2100, - eSIR_NIM_MMH_ERR_INV_EVENT, - eSIR_NIM_MMH_ERR_MSG_LEN, - eSIR_NIM_MMH_ERR_IN_Q_TYPE, - - /* MNT Return Codes */ - eSIR_NIM_MNT_ERROR_BASE = 0x2140, - - /* WDT Errors */ - eSIR_NIM_WDT_ERROR_BASE = 0x2180, - - /* LIM Return Codes */ - eSIR_LIM_ERROR_BASE = 0x2200, + eSIR_HAL_STA_DOES_NOT_EXIST, + eSIR_HAL_INPUT_INVALID, eSIR_LIM_IGNORE_BEACON, eSIR_LIM_INVALID_STA, eSIR_LIM_MAX_STA_REACHED_ERROR, - - /* SCH Return Codes */ - eSIR_SCH_ERROR_BASE = 0x2300, - - /* PMM Return Codes */ - eSIR_PMM_ERROR_BASE = 0x2400, - eSIR_PMM_INVALID_MODE, - eSIR_PMM_INVALID_STATE, - eSIR_PMM_INVALID_ROLE, - eSIR_PMM_STA_NOT_ASSOCIATED, - eSIR_PMM_HEART_BEAT_TMOUT, - eSIR_PMM_NTH_BEACON_DELIVERY, - - /* ARQ Return Codes */ - eSIR_ARQ_ERROR_BASE = 0x2500, - - /* CFG Return Codes */ - eSIR_CFG_ERROR_BASE = 2600, eSIR_CFG_INVALID_ID, eSIR_CFG_INVALID_LEN, - - /* parser Return Codes */ - eSIR_PRS_ERROR_BASE = 0x2700, eSIR_IGNORE_IE, - - /* Put all your return codes above this line */ - eSIR_ERROR_LAST } tSirRetStatus; #define IS_SIR_STATUS_SUCCESS(status) (eSIR_SUCCESS == status) diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index 6a1965451f4b..8c0acb4d119e 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -524,8 +524,6 @@ QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, uint8_t device_mode, uint8_t *macAddr, uint8_t sessionId); -void sme_set_cfg_privacy(tHalHandle hHal, struct csr_roam_profile *pProfile, - bool fPrivacy); void sme_get_recovery_stats(tHalHandle hHal); QDF_STATUS sme_neighbor_report_request(tHalHandle hHal, uint8_t sessionId, tpRrmNeighborReq pRrmNeighborReq, @@ -1236,18 +1234,11 @@ QDF_STATUS sme_reset_tsfcb(tHalHandle h_hal); #ifdef WLAN_FEATURE_TSF QDF_STATUS sme_set_tsf_gpio(tHalHandle h_hal, uint32_t pinvalue); -QDF_STATUS sme_reset_tsf_gpio(tHalHandle h_hal); - #else static inline QDF_STATUS sme_set_tsf_gpio(tHalHandle h_hal, uint32_t pinvalue) { return QDF_STATUS_E_FAILURE; } -static inline QDF_STATUS sme_reset_tsf_gpio(tHalHandle h_hal) -{ - return QDF_STATUS_E_FAILURE; -} - #endif QDF_STATUS sme_update_mimo_power_save(tHalHandle hHal, diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index b5f2e4d5c43c..30c61c5a0810 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -4628,28 +4628,6 @@ QDF_STATUS sme_tx_fail_monitor_start_stop_ind(tHalHandle hHal, uint8_t return status; } -/* - * sme_set_cfg_privacy() - - * API to set configure privacy parameters - * - * hHal - The handle returned by mac_open. - * pProfile - Pointer CSR Roam profile. - * fPrivacy - This parameter indicates status of privacy - * Return void - */ -void sme_set_cfg_privacy(tHalHandle hHal, - struct csr_roam_profile *pProfile, bool fPrivacy) -{ - tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - - MTRACE(qdf_trace(QDF_MODULE_ID_SME, - TRACE_CODE_SME_RX_HDD_SET_CFGPRIVACY, NO_SESSION, 0)); - if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { - csr_set_cfg_privacy(pMac, pProfile, fPrivacy); - sme_release_global_lock(&pMac->sme); - } -} - /* * sme_neighbor_report_request() - * API to request neighbor report. diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 550e3cbab442..3fe3061ef3ff 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -9819,21 +9819,6 @@ bool csr_is_roam_command_waiting_for_session(tpAniSirGlobal pMac, return fRet; } -bool csr_is_roam_command_waiting(tpAniSirGlobal pMac) -{ - bool fRet = false; - uint32_t i; - - for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) { - fRet = csr_is_roam_command_waiting_for_session(pMac, i); - if (CSR_IS_SESSION_VALID(pMac, i) - && (fRet)) { - break; - } - } - return fRet; -} - static void csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, uint32_t result, uint8_t sme_session_id) diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h index 2c1d591ca26d..9723750476f7 100644 --- a/core/sme/src/csr/csr_inside_api.h +++ b/core/sme/src/csr/csr_inside_api.h @@ -330,7 +330,6 @@ QDF_STATUS csr_roam_issue_stop_bss(tpAniSirGlobal pMac, uint32_t sessionId, enum csr_roam_substate NewSubstate); bool csr_is_same_profile(tpAniSirGlobal pMac, tCsrRoamConnectedProfile *pProfile1, struct csr_roam_profile *pProfile2); -bool csr_is_roam_command_waiting(tpAniSirGlobal pMac); bool csr_is_roam_command_waiting_for_session(tpAniSirGlobal pMac, uint32_t sessionId); eRoamCmdStatus csr_get_roam_complete_status(tpAniSirGlobal pMac,