diff options
| author | Service qcabuildsw <qcabuildsw@localhost> | 2017-03-24 10:12:57 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-24 10:12:57 -0700 |
| commit | c48d717d86a86fe92d1feaf280c345e0c7c182b1 (patch) | |
| tree | b4245d141a7e83e5c8e499288595c152071d7ac7 | |
| parent | 0c540cc619250753c91bcac2e113cc6e474c85c5 (diff) | |
| parent | eaa3d487d5a5d1b5cb6d31755112f1df4ad253b9 (diff) | |
Merge "qcacld-3.0: HDD: Remove obsolete support for Class C stats" into wlan-cld3.driver.lnx.1.1-dev
| -rw-r--r-- | core/hdd/inc/wlan_hdd_main.h | 1 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_wext.c | 9 |
2 files changed, 1 insertions, 9 deletions
diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 925b01824490..a4630e1c7358 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -434,7 +434,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 fbdd7928bce1..7aa05d9b354c 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -3847,7 +3847,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) @@ -3856,8 +3855,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 @@ -3869,8 +3867,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)); } @@ -4849,7 +4845,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, @@ -11535,7 +11530,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 @@ -11559,7 +11553,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 |