From a503892bf97100deabb6ba9f75a0ce5f5b4530e8 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 10 Mar 2017 15:50:00 -0800 Subject: qcacld-3.0: HDD: Remove obsolete support for SME_PER_STA_STATS HDD currently requests SME_PER_STA_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: I070685a0ca2b9c53b93c1f950eab97ea65f43f1e CRs-Fixed: 2020065 --- core/hdd/inc/wlan_hdd_main.h | 1 - core/hdd/src/wlan_hdd_wext.c | 13 +++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 47a7b3444729..82b2f3463401 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -437,7 +437,6 @@ typedef struct hdd_stats_s { tCsrGlobalClassBStatsInfo ClassB_stat; tCsrGlobalClassCStatsInfo ClassC_stat; tCsrGlobalClassDStatsInfo ClassD_stat; - tCsrPerStaStatsInfo perStaStats; struct csr_per_chain_rssi_stats_info per_chain_rssi_stats; hdd_tx_rx_stats_t hddTxRxStats; struct hdd_arp_stats_s hdd_arp_stats; diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index eb29e4758e56..fbdd7928bce1 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -3849,7 +3849,6 @@ static void hdd_statistics_cb(void *pStats, void *pContext) tCsrGlobalClassBStatsInfo *pClassBStats = NULL; tCsrGlobalClassCStatsInfo *pClassCStats = NULL; tCsrGlobalClassDStatsInfo *pClassDStats = NULL; - tCsrPerStaStatsInfo *pPerStaStats = NULL; if (pAdapter != NULL) pStatsCache = &pAdapter->hdd_stats; @@ -3859,7 +3858,6 @@ static void hdd_statistics_cb(void *pStats, void *pContext) pClassBStats = (tCsrGlobalClassBStatsInfo *) (pClassAStats + 1); pClassCStats = (tCsrGlobalClassCStatsInfo *) (pClassBStats + 1); pClassDStats = (tCsrGlobalClassDStatsInfo *) (pClassCStats + 1); - pPerStaStats = (tCsrPerStaStatsInfo *) (pClassDStats + 1); if (pStatsCache != NULL) { /* copy the stats into the cache we keep in the @@ -3875,8 +3873,6 @@ static void hdd_statistics_cb(void *pStats, void *pContext) sizeof(pStatsCache->ClassC_stat)); qdf_mem_copy(&pStatsCache->ClassD_stat, pClassDStats, sizeof(pStatsCache->ClassD_stat)); - qdf_mem_copy(&pStatsCache->perStaStats, pPerStaStats, - sizeof(pStatsCache->perStaStats)); } if (pAdapter) { @@ -4854,8 +4850,7 @@ static int __iw_get_bitrate(struct net_device *dev, SME_GLOBAL_CLASSA_STATS | SME_GLOBAL_CLASSB_STATS | SME_GLOBAL_CLASSC_STATS | - SME_GLOBAL_CLASSD_STATS | - SME_PER_STA_STATS, + SME_GLOBAL_CLASSD_STATS, hdd_statistics_cb, 0, false, pHddStaCtx->conn_info.staId[0], @@ -11541,8 +11536,7 @@ static int __iw_get_statistics(struct net_device *dev, SME_GLOBAL_CLASSA_STATS | SME_GLOBAL_CLASSB_STATS | SME_GLOBAL_CLASSC_STATS | - SME_GLOBAL_CLASSD_STATS | - SME_PER_STA_STATS, + SME_GLOBAL_CLASSD_STATS, hdd_statistics_cb, 0, false, (WLAN_HDD_GET_STATION_CTX_PTR (pAdapter))->conn_info.staId[0], @@ -11566,8 +11560,7 @@ static int __iw_get_statistics(struct net_device *dev, SME_GLOBAL_CLASSA_STATS | SME_GLOBAL_CLASSB_STATS | SME_GLOBAL_CLASSC_STATS | - SME_GLOBAL_CLASSD_STATS | - SME_PER_STA_STATS, + SME_GLOBAL_CLASSD_STATS, NULL, 0, false, (WLAN_HDD_GET_STATION_CTX_PTR (pAdapter))->conn_info. -- cgit v1.2.3