Browse Source

qcacld-3.0: SME: Remove obsolete support for tCsrPerStaStatsInfo

SME currently has legacy code to support the tCsrPerStaStatsInfo data
structure. 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 the support for these stats has been
removed from HDD.  So remove support for these stats from SME.

Change-Id: Ibab7f94764c68933633c46da497613add0824ff1
CRs-Fixed: 2020067
Jeff Johnson 8 years ago
parent
commit
60be8a9f44
4 changed files with 0 additions and 33 deletions
  1. 0 6
      core/sme/inc/csr_api.h
  2. 0 4
      core/sme/inc/csr_internal.h
  3. 0 1
      core/sme/inc/sme_api.h
  4. 0 22
      core/sme/src/csr/csr_api_roam.c

+ 0 - 6
core/sme/inc/csr_api.h

@@ -1555,12 +1555,6 @@ typedef struct tagCsrGlobalClassDStatsInfo {
 
 } tCsrGlobalClassDStatsInfo;
 
-typedef struct tagCsrPerStaStatsInfo {
-	uint32_t tx_frag_cnt[4];
-	uint32_t tx_ampdu_cnt;
-	uint32_t tx_mpdu_in_ampdu_cnt;
-} tCsrPerStaStatsInfo;
-
 /**
  * struct csr_per_chain_rssi_stats_info - stores chain rssi
  * @rssi: array containing rssi for all chains

+ 0 - 4
core/sme/inc/csr_internal.h

@@ -44,8 +44,6 @@
 
 #include "sir_types.h"
 
-#define CSR_MAX_STA (HAL_NUM_STA)
-
 /* define scan return criteria. LIM should use these define as well */
 #define CSR_SCAN_RETURN_AFTER_ALL_CHANNELS          (0)
 #define CSR_SCAN_RETURN_AFTER_FIRST_MATCH           (0x01)
@@ -229,7 +227,6 @@ typedef enum {
 	eCsrGlobalClassBStats,
 	eCsrGlobalClassCStats,
 	eCsrGlobalClassDStats,
-	eCsrPerStaStats,
 	csr_per_chain_rssi_stats,
 	eCsrMaxStats
 } eCsrRoamStatsClassTypes;
@@ -1016,7 +1013,6 @@ typedef struct tagCsrRoamStruct {
 	tCsrGlobalClassBStatsInfo classBStatsInfo;
 	tCsrGlobalClassCStatsInfo classCStatsInfo;
 	tCsrGlobalClassDStatsInfo classDStatsInfo;
-	tCsrPerStaStatsInfo perStaStatsInfo[CSR_MAX_STA];
 	struct csr_per_chain_rssi_stats_info  per_chain_rssi_stats;
 	tDblLinkList statsClientReqList;
 	tDblLinkList peStatsReqList;

+ 0 - 1
core/sme/inc/sme_api.h

@@ -61,7 +61,6 @@
 #define SME_GLOBAL_CLASSB_STATS   (1 << eCsrGlobalClassBStats)
 #define SME_GLOBAL_CLASSC_STATS   (1 << eCsrGlobalClassCStats)
 #define SME_GLOBAL_CLASSD_STATS   (1 << eCsrGlobalClassDStats)
-#define SME_PER_STA_STATS         (1 << eCsrPerStaStats)
 #define SME_PER_CHAIN_RSSI_STATS  (1 << csr_per_chain_rssi_stats)
 
 #define SME_SESSION_ID_ANY        50

+ 0 - 22
core/sme/src/csr/csr_api_roam.c

@@ -16128,20 +16128,6 @@ csr_update_stats(tpAniSirGlobal mac, uint8_t stats_type,
 		*stats += sizeof(tCsrGlobalClassCStatsInfo);
 		*length -= sizeof(tCsrGlobalClassCStatsInfo);
 		break;
-	case eCsrPerStaStats:
-		sms_log(mac, LOG2, FL("PerSta stats"));
-		if (CSR_MAX_STA > sme_stats_rsp->staId) {
-			qdf_mem_copy(
-				&mac->roam.perStaStatsInfo[sme_stats_rsp->staId],
-				*stats, sizeof(tCsrPerStaStatsInfo));
-		} else {
-			sms_log(mac, LOGE, FL("out bound staId:%d. failed to copy PerSta stats"),
-				sme_stats_rsp->staId);
-			QDF_ASSERT(0);
-		}
-		*stats += sizeof(tCsrPerStaStatsInfo);
-		*length -= sizeof(tCsrPerStaStatsInfo);
-		break;
 	case csr_per_chain_rssi_stats:
 		sms_log(mac, LOG2,
 			FL("csrRoamStatsRspProcessor:Per Chain RSSI stats"));
@@ -18307,14 +18293,6 @@ void csr_roam_report_statistics(tpAniSirGlobal pMac, uint32_t statsMask,
 					     sizeof(tCsrGlobalClassDStatsInfo));
 				pStats += sizeof(tCsrGlobalClassDStatsInfo);
 				break;
-			case eCsrPerStaStats:
-				sms_log(pMac, LOG2, FL("PerSta stats"));
-				qdf_mem_copy(pStats,
-					     (uint8_t *) &pMac->roam.
-					     perStaStatsInfo[staId],
-					     sizeof(tCsrPerStaStatsInfo));
-				pStats += sizeof(tCsrPerStaStatsInfo);
-				break;
 			case csr_per_chain_rssi_stats:
 				sms_log(pMac, LOG2, FL("Per Chain RSSI stats"));
 				qdf_mem_copy(pStats,