From f2dac4fcf2b137619d2e7d2ead7906a28fd0ed74 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Thu, 16 Mar 2017 11:41:31 -0700 Subject: [PATCH] qcacld-3.0: HDD: Remove obsolete support for Class B stats HDD currently requests SME_GLOBAL_CLASSB_STATS in a few of its legacy ioctl handlers. 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 HDD doesn't actually do anything with the data returned. So remove support for these stats from HDD. Change-Id: I97acf231cfffba630aa6a9ac98d3b8298fb8b7d7 CRs-Fixed: 2021531 --- core/hdd/inc/wlan_hdd_main.h | 1 - core/hdd/src/wlan_hdd_wext.c | 9 +-------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index fd1acbbe736b..7ade19a8dd06 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -401,7 +401,6 @@ typedef struct hdd_pmf_stats_s { typedef struct hdd_stats_s { tCsrSummaryStatsInfo summary_stat; tCsrGlobalClassAStatsInfo ClassA_stat; - tCsrGlobalClassBStatsInfo ClassB_stat; tCsrGlobalClassDStatsInfo ClassD_stat; struct csr_per_chain_rssi_stats_info per_chain_rssi_stats; hdd_tx_rx_stats_t hddTxRxStats; diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 6ce645593b92..47eb6a355acb 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -3613,7 +3613,6 @@ static void hdd_statistics_cb(void *pStats, void *pContext) tCsrSummaryStatsInfo *pSummaryStats = NULL; tCsrGlobalClassAStatsInfo *pClassAStats = NULL; - tCsrGlobalClassBStatsInfo *pClassBStats = NULL; tCsrGlobalClassDStatsInfo *pClassDStats = NULL; if (pAdapter != NULL) @@ -3621,8 +3620,7 @@ static void hdd_statistics_cb(void *pStats, void *pContext) pSummaryStats = (tCsrSummaryStatsInfo *) pStats; pClassAStats = (tCsrGlobalClassAStatsInfo *) (pSummaryStats + 1); - pClassBStats = (tCsrGlobalClassBStatsInfo *) (pClassAStats + 1); - pClassDStats = (tCsrGlobalClassDStatsInfo *) (pClassBStats + 1); + pClassDStats = (tCsrGlobalClassDStatsInfo *) (pClassAStats + 1); if (pStatsCache != NULL) { /* copy the stats into the cache we keep in the @@ -3632,8 +3630,6 @@ static void hdd_statistics_cb(void *pStats, void *pContext) sizeof(pStatsCache->summary_stat)); qdf_mem_copy(&pStatsCache->ClassA_stat, pClassAStats, sizeof(pStatsCache->ClassA_stat)); - qdf_mem_copy(&pStatsCache->ClassB_stat, pClassBStats, - sizeof(pStatsCache->ClassB_stat)); qdf_mem_copy(&pStatsCache->ClassD_stat, pClassDStats, sizeof(pStatsCache->ClassD_stat)); } @@ -4633,7 +4629,6 @@ static int __iw_get_bitrate(struct net_device *dev, eCSR_HDD, SME_SUMMARY_STATS | SME_GLOBAL_CLASSA_STATS | - SME_GLOBAL_CLASSB_STATS | SME_GLOBAL_CLASSD_STATS, hdd_statistics_cb, 0, false, @@ -11469,7 +11464,6 @@ static int __iw_get_statistics(struct net_device *dev, status = sme_get_statistics(hdd_ctx->hHal, eCSR_HDD, SME_SUMMARY_STATS | SME_GLOBAL_CLASSA_STATS | - SME_GLOBAL_CLASSB_STATS | SME_GLOBAL_CLASSD_STATS, hdd_statistics_cb, 0, false, (WLAN_HDD_GET_STATION_CTX_PTR @@ -11492,7 +11486,6 @@ static int __iw_get_statistics(struct net_device *dev, status = sme_get_statistics(hdd_ctx->hHal, eCSR_HDD, SME_SUMMARY_STATS | SME_GLOBAL_CLASSA_STATS | - SME_GLOBAL_CLASSB_STATS | SME_GLOBAL_CLASSD_STATS, NULL, 0, false, (WLAN_HDD_GET_STATION_CTX_PTR