From 0e5709deebf1261ef0d88fa07510f27fdcba4d16 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Thu, 16 Mar 2017 11:41:31 -0700 Subject: 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 a4630e1c7358..ef425ddb5248 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -433,7 +433,6 @@ struct hdd_arp_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 7aa05d9b354c..4b278dc5ddf8 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -3846,7 +3846,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) @@ -3854,8 +3853,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 @@ -3865,8 +3863,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)); } @@ -4844,7 +4840,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, @@ -11529,7 +11524,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 @@ -11552,7 +11546,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 -- cgit v1.2.3