From afb601c2c62db381c5a5ce421e397d3b232cbd52 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Thu, 16 Mar 2017 10:03:41 -0700 Subject: qcacld-3.0: SME: Remove obsolete support for Class C stats SME currently has legacy code to support the tCsrGlobalClassCStatsInfo data structure. However these stats were specific to the WDI firmware API used by older generations of hardware, and this interface is not supported by WMI. In addition the support for these stats has been removed from HDD. So remove support for these stats from SME. Change-Id: I3e63f99e1dd1b509694e3953490355b4c23f6c73 CRs-Fixed: 2021528 --- core/sme/inc/csr_api.h | 10 ---------- core/sme/inc/csr_internal.h | 2 -- core/sme/inc/sme_api.h | 1 - core/sme/src/csr/csr_api_roam.c | 15 --------------- 4 files changed, 28 deletions(-) diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index 25af56de2fc7..9d0d3e957cb9 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -1535,16 +1535,6 @@ typedef struct tagCsrGlobalClassBStatsInfo { } tCsrGlobalClassBStatsInfo; -typedef struct tagCsrGlobalClassCStatsInfo { - uint32_t rx_amsdu_cnt; - uint32_t rx_ampdu_cnt; - uint32_t tx_20_frm_cnt; - uint32_t rx_20_frm_cnt; - uint32_t rx_mpdu_in_ampdu_cnt; - uint32_t ampdu_delimiter_crc_err; - -} tCsrGlobalClassCStatsInfo; - typedef struct tagCsrGlobalClassDStatsInfo { uint32_t tx_uc_frm_cnt; uint32_t tx_mc_frm_cnt; diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index 2efd94d0303b..114d69776e53 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -235,7 +235,6 @@ typedef enum { eCsrSummaryStats = 0, eCsrGlobalClassAStats, eCsrGlobalClassBStats, - eCsrGlobalClassCStats, eCsrGlobalClassDStats, csr_per_chain_rssi_stats, eCsrMaxStats @@ -1022,7 +1021,6 @@ typedef struct tagCsrRoamStruct { tCsrSummaryStatsInfo summaryStatsInfo; tCsrGlobalClassAStatsInfo classAStatsInfo; tCsrGlobalClassBStatsInfo classBStatsInfo; - tCsrGlobalClassCStatsInfo classCStatsInfo; tCsrGlobalClassDStatsInfo classDStatsInfo; struct csr_per_chain_rssi_stats_info per_chain_rssi_stats; tDblLinkList statsClientReqList; diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index add07344d121..74bc0d551290 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -57,7 +57,6 @@ #define SME_SUMMARY_STATS (1 << eCsrSummaryStats) #define SME_GLOBAL_CLASSA_STATS (1 << eCsrGlobalClassAStats) #define SME_GLOBAL_CLASSB_STATS (1 << eCsrGlobalClassBStats) -#define SME_GLOBAL_CLASSC_STATS (1 << eCsrGlobalClassCStats) #define SME_GLOBAL_CLASSD_STATS (1 << eCsrGlobalClassDStats) #define SME_PER_CHAIN_RSSI_STATS (1 << csr_per_chain_rssi_stats) diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index d5fbd8a4d472..09fdd1a0dc67 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -16298,13 +16298,6 @@ csr_update_stats(tpAniSirGlobal mac, uint8_t stats_type, *stats += sizeof(tCsrGlobalClassBStatsInfo); *length -= sizeof(tCsrGlobalClassBStatsInfo); break; - case eCsrGlobalClassCStats: - sme_debug("ClassC stats"); - qdf_mem_copy((uint8_t *) &mac->roam.classCStatsInfo, *stats, - sizeof(tCsrGlobalClassCStatsInfo)); - *stats += sizeof(tCsrGlobalClassCStatsInfo); - *length -= sizeof(tCsrGlobalClassCStatsInfo); - break; case csr_per_chain_rssi_stats: sme_debug("csrRoamStatsRspProcessor:Per Chain RSSI stats"); qdf_mem_copy((uint8_t *)&mac->roam.per_chain_rssi_stats, @@ -18451,14 +18444,6 @@ void csr_roam_report_statistics(tpAniSirGlobal pMac, uint32_t statsMask, sizeof(tCsrGlobalClassBStatsInfo)); pStats += sizeof(tCsrGlobalClassBStatsInfo); break; - case eCsrGlobalClassCStats: - sme_debug("ClassC stats"); - qdf_mem_copy(pStats, - (uint8_t *) &pMac->roam. - classCStatsInfo, - sizeof(tCsrGlobalClassCStatsInfo)); - pStats += sizeof(tCsrGlobalClassCStatsInfo); - break; case eCsrGlobalClassDStats: sme_debug("ClassD stats"); qdf_mem_copy(pStats, -- cgit v1.2.3