From 30f8455ee1cb5d1170cd5bd95a1048d1e45179d0 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Wed, 13 Sep 2017 14:55:25 -0700 Subject: [PATCH] qcacld-3.0: Remove cds context from struct sAniGetTsmStatsReq Currently struct sAniGetTsmStatsReq contains a p_cds_context field, but this field is unused. Remove the field along with all of the code that is present to populate it. Change-Id: I1335034b959b77223834d7cf77e33c1f9bd1b358 CRs-Fixed: 2109433 --- core/hdd/src/wlan_hdd_ioctl.c | 2 +- core/mac/inc/sir_api.h | 1 - core/sme/inc/csr_internal.h | 2 +- core/sme/inc/sme_api.h | 2 +- core/sme/src/common/sme_api.c | 5 ++--- core/sme/src/csr/csr_api_roam.c | 4 +--- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index 2f922e1043b3..41db2ee8c360 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -213,7 +213,7 @@ static int hdd_get_tsm_stats(struct hdd_adapter *adapter, status = sme_get_tsm_stats(hdd_ctx->hHal, hdd_get_tsm_stats_cb, hdd_sta_ctx->conn_info.staId[0], hdd_sta_ctx->conn_info.bssId, - cookie, hdd_ctx->pcds_context, tid); + cookie, tid); if (QDF_STATUS_SUCCESS != status) { hdd_err("Unable to retrieve tsm statistics"); ret = qdf_status_to_os_return(status); diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 841fab3b198e..f17d5a32ccb8 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -1066,7 +1066,6 @@ typedef struct sAniGetTsmStatsReq { struct qdf_mac_addr bssId; void *tsmStatsCallback; void *pDevContext; /* device context */ - void *p_cds_context; /* cds context */ } tAniGetTsmStatsReq, *tpAniGetTsmStatsReq; typedef struct sAniGetTsmStatsRsp { diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index 83d313a9cd72..dbc55341fbc4 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -1293,7 +1293,7 @@ QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, tCsrTsmStatsCallback callback, uint8_t staId, struct qdf_mac_addr bssId, - void *pContext, void *p_cds_context, uint8_t tid); + void *pContext, uint8_t tid); #endif /* Remove this code once SLM_Sessionization is supported */ diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index 69ba4d04a2db..b68613ce421f 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -379,7 +379,7 @@ QDF_STATUS sme_get_snr(tHalHandle hHal, QDF_STATUS sme_get_tsm_stats(tHalHandle hHal, tCsrTsmStatsCallback callback, uint8_t staId, struct qdf_mac_addr bssId, - void *pContext, void *p_cds_context, uint8_t tid); + void *pContext, uint8_t tid); QDF_STATUS sme_set_cckm_ie(tHalHandle hHal, uint8_t sessionId, uint8_t *pCckmIe, uint8_t cckmIeLen); diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 79a8b171c365..12c5c3b080d3 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -1902,7 +1902,6 @@ QDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, * @staId: The station ID for which the stats is requested for * @bssId: bssid * @pContext: user context to be passed back along with the callback - * @p_cds_context: CDS context * @tid: Traffic id * * API register a callback to get TSM Stats. @@ -1912,7 +1911,7 @@ QDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, QDF_STATUS sme_get_tsm_stats(tHalHandle hHal, tCsrTsmStatsCallback callback, uint8_t staId, struct qdf_mac_addr bssId, - void *pContext, void *p_cds_context, uint8_t tid) + void *pContext, uint8_t tid) { QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -1921,7 +1920,7 @@ QDF_STATUS sme_get_tsm_stats(tHalHandle hHal, if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_get_tsm_stats(pMac, callback, staId, bssId, pContext, - p_cds_context, tid); + tid); sme_release_global_lock(&pMac->sme); } return status; diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 54297f5070d7..4fa4eb7264b2 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -1797,7 +1797,6 @@ static void csr_send_ese_adjacent_ap_rep_ind(tpAniSirGlobal pMac, * @staId: Station id * @bssId: bssid * @pContext: pointer to context - * @p_cds_context: cds context * @tid: traffic id * * Return: QDF_STATUS enumeration @@ -1806,7 +1805,7 @@ QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, tCsrTsmStatsCallback callback, uint8_t staId, struct qdf_mac_addr bssId, - void *pContext, void *p_cds_context, uint8_t tid) + void *pContext, uint8_t tid) { QDF_STATUS status = QDF_STATUS_SUCCESS; tAniGetTsmStatsReq *pMsg = NULL; @@ -1825,7 +1824,6 @@ QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, qdf_copy_macaddr(&pMsg->bssId, &bssId); pMsg->tsmStatsCallback = callback; pMsg->pDevContext = pContext; - pMsg->p_cds_context = p_cds_context; status = umac_send_mb_message_to_mac(pMsg); if (!QDF_IS_STATUS_SUCCESS(status)) { sme_debug("csr_get_tsm_stats: failed to send down the rssi req");