Merge "qcacld-3.0: SME: Remove obsolete support for Class B stats" into wlan-cld3.driver.lnx.1.1-dev

4 files changed, 0 insertions, 42 deletions

diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h
index 9d0d3e957cb9..82f7531a605d 100644
--- a/core/sme/inc/csr_api.h
+++ b/core/sme/inc/csr_api.h
@@ -1511,30 +1511,6 @@ typedef struct tagCsrGlobalClassAStatsInfo {
 
 } tCsrGlobalClassAStatsInfo;
 
-typedef struct tagCsrGlobalClassBStatsInfo {
-	uint32_t uc_rx_wep_unencrypted_frm_cnt;
-	uint32_t uc_rx_mic_fail_cnt;
-	uint32_t uc_tkip_icv_err;
-	uint32_t uc_aes_ccmp_format_err;
-	uint32_t uc_aes_ccmp_replay_cnt;
-	uint32_t uc_aes_ccmp_decrpt_err;
-	uint32_t uc_wep_undecryptable_cnt;
-	uint32_t uc_wep_icv_err;
-	uint32_t uc_rx_decrypt_succ_cnt;
-	uint32_t uc_rx_decrypt_fail_cnt;
-	uint32_t mcbc_rx_wep_unencrypted_frm_cnt;
-	uint32_t mcbc_rx_mic_fail_cnt;
-	uint32_t mcbc_tkip_icv_err;
-	uint32_t mcbc_aes_ccmp_format_err;
-	uint32_t mcbc_aes_ccmp_replay_cnt;
-	uint32_t mcbc_aes_ccmp_decrpt_err;
-	uint32_t mcbc_wep_undecryptable_cnt;
-	uint32_t mcbc_wep_icv_err;
-	uint32_t mcbc_rx_decrypt_succ_cnt;
-	uint32_t mcbc_rx_decrypt_fail_cnt;
-
-} tCsrGlobalClassBStatsInfo;
-
 typedef struct tagCsrGlobalClassDStatsInfo {
 	uint32_t tx_uc_frm_cnt;
 	uint32_t tx_mc_frm_cnt;
diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h
index 114d69776e53..0487e5c57e8b 100644
--- a/core/sme/inc/csr_internal.h
+++ b/core/sme/inc/csr_internal.h
@@ -234,7 +234,6 @@ typedef enum {
 typedef enum {
 	eCsrSummaryStats = 0,
 	eCsrGlobalClassAStats,
-	eCsrGlobalClassBStats,
 	eCsrGlobalClassDStats,
 	csr_per_chain_rssi_stats,
 	eCsrMaxStats
@@ -1020,7 +1019,6 @@ typedef struct tagCsrRoamStruct {
 	qdf_mc_timer_t hTimerWaitForKey; /* support timeout for WaitForKey */
 	tCsrSummaryStatsInfo summaryStatsInfo;
 	tCsrGlobalClassAStatsInfo classAStatsInfo;
-	tCsrGlobalClassBStatsInfo classBStatsInfo;
 	tCsrGlobalClassDStatsInfo classDStatsInfo;
 	struct csr_per_chain_rssi_stats_info  per_chain_rssi_stats;
 	tDblLinkList statsClientReqList;
diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h
index 74bc0d551290..0fa7d2b9ffeb 100644
--- a/core/sme/inc/sme_api.h
+++ b/core/sme/inc/sme_api.h
@@ -56,7 +56,6 @@
 
 #define SME_SUMMARY_STATS         (1 << eCsrSummaryStats)
 #define SME_GLOBAL_CLASSA_STATS   (1 << eCsrGlobalClassAStats)
-#define SME_GLOBAL_CLASSB_STATS   (1 << eCsrGlobalClassBStats)
 #define SME_GLOBAL_CLASSD_STATS   (1 << eCsrGlobalClassDStats)
 #define SME_PER_CHAIN_RSSI_STATS  (1 << csr_per_chain_rssi_stats)
 
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 09fdd1a0dc67..6198ba3e3f5d 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -16291,13 +16291,6 @@ csr_update_stats(tpAniSirGlobal mac, uint8_t stats_type,
 		*stats += sizeof(tCsrGlobalClassAStatsInfo);
 		*length -= sizeof(tCsrGlobalClassAStatsInfo);
 		break;
-	case eCsrGlobalClassBStats:
-		sme_debug("ClassB stats");
-		qdf_mem_copy((uint8_t *) &mac->roam.classBStatsInfo, *stats,
-			     sizeof(tCsrGlobalClassBStatsInfo));
-		*stats += sizeof(tCsrGlobalClassBStatsInfo);
-		*length -= sizeof(tCsrGlobalClassBStatsInfo);
-		break;
 	case csr_per_chain_rssi_stats:
 		sme_debug("csrRoamStatsRspProcessor:Per Chain RSSI stats");
 		qdf_mem_copy((uint8_t *)&mac->roam.per_chain_rssi_stats,
@@ -18436,14 +18429,6 @@ void csr_roam_report_statistics(tpAniSirGlobal pMac, uint32_t statsMask,
 					     sizeof(tCsrGlobalClassAStatsInfo));
 				pStats += sizeof(tCsrGlobalClassAStatsInfo);
 				break;
-			case eCsrGlobalClassBStats:
-				sme_debug("ClassB stats");
-				qdf_mem_copy(pStats,
-					     (uint8_t *) &pMac->roam.
-					     classBStatsInfo,
-					     sizeof(tCsrGlobalClassBStatsInfo));
-				pStats += sizeof(tCsrGlobalClassBStatsInfo);
-				break;
 			case eCsrGlobalClassDStats:
 				sme_debug("ClassD stats");
 				qdf_mem_copy(pStats,