From c040269930727a417f4d8653f622ad4b00cde0f0 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Thu, 16 Mar 2017 09:48:49 -0700 Subject: [PATCH] qcacld-3.0: HDD: Remove obsolete support for Class C stats HDD currently requests SME_GLOBAL_CLASSC_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: I846aacb7076f29199bd4d3bbce4ca0654565f2ef CRs-Fixed: 2021523 --- 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 39d793527340..fd1acbbe736b 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -402,7 +402,6 @@ typedef struct hdd_stats_s { tCsrSummaryStatsInfo summary_stat; tCsrGlobalClassAStatsInfo ClassA_stat; tCsrGlobalClassBStatsInfo ClassB_stat; - tCsrGlobalClassCStatsInfo ClassC_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 8c4030bce3f9..6ce645593b92 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -3614,7 +3614,6 @@ static void hdd_statistics_cb(void *pStats, void *pContext) tCsrSummaryStatsInfo *pSummaryStats = NULL; tCsrGlobalClassAStatsInfo *pClassAStats = NULL; tCsrGlobalClassBStatsInfo *pClassBStats = NULL; - tCsrGlobalClassCStatsInfo *pClassCStats = NULL; tCsrGlobalClassDStatsInfo *pClassDStats = NULL; if (pAdapter != NULL) @@ -3623,8 +3622,7 @@ static void hdd_statistics_cb(void *pStats, void *pContext) pSummaryStats = (tCsrSummaryStatsInfo *) pStats; pClassAStats = (tCsrGlobalClassAStatsInfo *) (pSummaryStats + 1); pClassBStats = (tCsrGlobalClassBStatsInfo *) (pClassAStats + 1); - pClassCStats = (tCsrGlobalClassCStatsInfo *) (pClassBStats + 1); - pClassDStats = (tCsrGlobalClassDStatsInfo *) (pClassCStats + 1); + pClassDStats = (tCsrGlobalClassDStatsInfo *) (pClassBStats + 1); if (pStatsCache != NULL) { /* copy the stats into the cache we keep in the @@ -3636,8 +3634,6 @@ static void hdd_statistics_cb(void *pStats, void *pContext) sizeof(pStatsCache->ClassA_stat)); qdf_mem_copy(&pStatsCache->ClassB_stat, pClassBStats, sizeof(pStatsCache->ClassB_stat)); - qdf_mem_copy(&pStatsCache->ClassC_stat, pClassCStats, - sizeof(pStatsCache->ClassC_stat)); qdf_mem_copy(&pStatsCache->ClassD_stat, pClassDStats, sizeof(pStatsCache->ClassD_stat)); } @@ -4638,7 +4634,6 @@ static int __iw_get_bitrate(struct net_device *dev, SME_SUMMARY_STATS | SME_GLOBAL_CLASSA_STATS | SME_GLOBAL_CLASSB_STATS | - SME_GLOBAL_CLASSC_STATS | SME_GLOBAL_CLASSD_STATS, hdd_statistics_cb, 0, false, @@ -11475,7 +11470,6 @@ static int __iw_get_statistics(struct net_device *dev, SME_SUMMARY_STATS | SME_GLOBAL_CLASSA_STATS | SME_GLOBAL_CLASSB_STATS | - SME_GLOBAL_CLASSC_STATS | SME_GLOBAL_CLASSD_STATS, hdd_statistics_cb, 0, false, (WLAN_HDD_GET_STATION_CTX_PTR @@ -11499,7 +11493,6 @@ static int __iw_get_statistics(struct net_device *dev, SME_SUMMARY_STATS | SME_GLOBAL_CLASSA_STATS | SME_GLOBAL_CLASSB_STATS | - SME_GLOBAL_CLASSC_STATS | SME_GLOBAL_CLASSD_STATS, NULL, 0, false, (WLAN_HDD_GET_STATION_CTX_PTR