qcacld-3.0: Remove obsolete tAniSirLim counters

The tAniSirLim struct contains multiple counters. Although all of them
are initialized, only some of them are ever incremented, and very few
of them actually have their values read. Since it is pointless to keep
counters that are never examined, remove the ones that are never read.

As part of the cleanup replace the tAniSirLim typedef with a properly
named struct to align with the coding standard.

Change-Id: I8b306ff9ae92a54953dd54b80c58e691612c43a0
CRs-Fixed: 3424936

core/mac/inc/ani_global.h

@@ -92,9 +92,6 @@ static inline mac_handle_t MAC_HANDLE(struct mac_context *mac)
 #define LIM_BSS_CAPS_SET(cap, val) ((val) |= (LIM_BSS_CAPS_ ## cap))
 #define LIM_BSS_CAPS_CLR(cap, val) ((val) &= (~(LIM_BSS_CAPS_ ## cap)))
 
-/* 40 beacons per heart beat interval is the default + 1 to count the rest */
-#define MAX_NO_BEACONS_PER_HEART_BEAT_INTERVAL 41
-
 #define SPACE_ASCII_VALUE  32
 
 #define WLAN_HOST_SEQ_NUM_MIN                           2048
@@ -299,7 +296,7 @@ typedef struct {
 	void *pMlmDeauthReq;
 } tLimDisassocDeauthCnfReq;
 
-typedef struct sAniSirLim {
+struct lim_context {
 	/* ////////////////////////////////////     TIMER RELATED START /////////////////////////////////////////// */
 
 	tLimTimers lim_timers;
@@ -338,58 +335,12 @@ typedef struct sAniSirLim {
 	uint16_t maxStation;
 	uint16_t maxBssId;
 
-	uint32_t gLimNumBeaconsRcvd;
-	uint32_t gLimNumBeaconsIgnored;
-
-	uint32_t gLimNumDeferredMsgs;
-
 	/* / Variable to keep track of number of currently associated STAs */
 	uint16_t gLimNumOfAniSTAs;      /* count of ANI peers */
 
 	tSirMacAddr gLimHeartBeatApMac[2];
 	uint8_t gLimHeartBeatApMacIndex;
 
-	/* Statistics to keep track of no. beacons rcvd in heart beat interval */
-	uint16_t
-		gLimHeartBeatBeaconStats[MAX_NO_BEACONS_PER_HEART_BEAT_INTERVAL];
-
-#ifdef WLAN_DEBUG
-	/* Debug counters */
-	uint32_t numTot, numBbt, numProtErr, numLearn, numLearnIgnore;
-	uint32_t numSme, numMAC[4][16];
-
-	/* Debug counter to track number of Assoc Req frame drops */
-	/* when received in sta->mlmState other than LINK_ESTABLISED */
-	uint32_t gLimNumAssocReqDropInvldState;
-	/* counters to track rejection of Assoc Req due to Admission Control */
-	uint32_t gLimNumAssocReqDropACRejectTS;
-	uint32_t gLimNumAssocReqDropACRejectSta;
-	/* Debug counter to track number of Reassoc Req frame drops */
-	/* when received in sta->mlmState other than LINK_ESTABLISED */
-	uint32_t gLimNumReassocReqDropInvldState;
-	/* Debug counter to track number of Hash Miss event that */
-	/* will not cause a sending of de-auth/de-associate frame */
-	uint32_t gLimNumHashMissIgnored;
-
-	/* Debug counter to track number of Beacon frames */
-	/* received in unexpected state */
-	uint32_t gLimUnexpBcnCnt;
-
-	/* Debug counter to track number of Beacon frames */
-	/* received in wt-join-state that do have SSID mismatch */
-	uint32_t gLimBcnSSIDMismatchCnt;
-
-	/* Debug counter to track number of Link establishments on STA/BP */
-	uint32_t gLimNumLinkEsts;
-
-	/* Debug counter to track number of Rx cleanup */
-	uint32_t gLimNumRxCleanup;
-
-	/* Debug counter to track different parse problem */
-	uint32_t gLim11bStaAssocRejectCount;
-
-#endif
-
 	/* ////////////////////////////////////////     STATS/COUNTER RELATED END /////////////////////////////////////////// */
 
 	/* ////////////////////////////////////////     STATES RELATED START /////////////////////////////////////////// */
@@ -650,7 +601,7 @@ typedef struct sAniSirLim {
 	wlan_scan_requester req_id;
 	QDF_STATUS (*sme_bcn_rcv_callback)(hdd_handle_t hdd_handle,
 				struct wlan_beacon_report *beacon_report);
-} tAniSirLim, *tpAniSirLim;
+};
 
 struct mgmt_frm_reg_info {
 	qdf_list_node_t node;   /* MUST be first element */
@@ -742,7 +693,7 @@ struct mac_context {
 	enum qdf_driver_type gDriverType;
 	struct wlan_mlme_chain_cfg fw_chain_cfg;
 	struct wlan_mlme_cfg *mlme_cfg;
-	tAniSirLim lim;
+	struct lim_context lim;
 	struct sch_context sch;
 	tAniSirSys sys;
 

core/mac/src/pe/lim/lim_api.c

@@ -107,11 +107,6 @@ static void __lim_init_bss_vars(struct mac_context *mac)
 
 static void __lim_init_stats_vars(struct mac_context *mac)
 {
-	mac->lim.gLimNumBeaconsRcvd = 0;
-	mac->lim.gLimNumBeaconsIgnored = 0;
-
-	mac->lim.gLimNumDeferredMsgs = 0;
-
 	/* / Variable to keep track of number of currently associated STAs */
 	mac->lim.gLimNumOfAniSTAs = 0; /* count of ANI peers */
 
@@ -120,31 +115,6 @@ static void __lim_init_stats_vars(struct mac_context *mac)
 	qdf_mem_zero(mac->lim.gLimHeartBeatApMac[1],
 			sizeof(tSirMacAddr));
 	mac->lim.gLimHeartBeatApMacIndex = 0;
-
-	/* Statistics to keep track of no. beacons rcvd in heart beat interval */
-	qdf_mem_zero(mac->lim.gLimHeartBeatBeaconStats,
-		    sizeof(mac->lim.gLimHeartBeatBeaconStats));
-
-#ifdef WLAN_DEBUG
-	/* Debug counters */
-	mac->lim.numTot = 0;
-	mac->lim.numBbt = 0;
-	mac->lim.numProtErr = 0;
-	mac->lim.numLearn = 0;
-	mac->lim.numLearnIgnore = 0;
-	mac->lim.numSme = 0;
-	qdf_mem_zero(mac->lim.numMAC, sizeof(mac->lim.numMAC));
-	mac->lim.gLimNumAssocReqDropInvldState = 0;
-	mac->lim.gLimNumAssocReqDropACRejectTS = 0;
-	mac->lim.gLimNumAssocReqDropACRejectSta = 0;
-	mac->lim.gLimNumReassocReqDropInvldState = 0;
-	mac->lim.gLimNumHashMissIgnored = 0;
-	mac->lim.gLimUnexpBcnCnt = 0;
-	mac->lim.gLimBcnSSIDMismatchCnt = 0;
-	mac->lim.gLimNumLinkEsts = 0;
-	mac->lim.gLimNumRxCleanup = 0;
-	mac->lim.gLim11bStaAssocRejectCount = 0;
-#endif
 }
 
 static void __lim_init_states(struct mac_context *mac)

core/mac/src/pe/lim/lim_assoc_utils.c

@@ -456,10 +456,7 @@ lim_cleanup_rx_path(struct mac_context *mac, tpDphHashNode sta,
 		/* Deactivating probe after heart beat timer */
 		lim_deactivate_and_change_timer(mac, eLIM_JOIN_FAIL_TIMER);
 	}
-#ifdef WLAN_DEBUG
-	/* increment a debug count */
-	mac->lim.gLimNumRxCleanup++;
-#endif
+
 	/* Do DEL BSS or DEL STA only if ADD BSS was success */
 	if (!pe_session->add_bss_failed) {
 		if (pe_session->limSmeState == eLIM_SME_JOIN_FAILURE_STATE) {
@@ -3204,9 +3201,6 @@ lim_check_and_announce_join_success(struct mac_context *mac_ctx,
 		 * Ignore received Beacon frame
 		 */
 		pe_debug("SSID received in Beacon does not match");
-#ifdef WLAN_DEBUG
-		mac_ctx->lim.gLimBcnSSIDMismatchCnt++;
-#endif
 		return;
 	}
 

core/mac/src/pe/lim/lim_process_assoc_req_frame.c

@@ -803,9 +803,6 @@ static bool lim_chk_is_11b_sta_supported(struct mac_context *mac_ctx,
 			pe_warn("Rejecting Re/Assoc req from 11b STA: "QDF_MAC_ADDR_FMT,
 				QDF_MAC_ADDR_REF(sa));
 
-#ifdef WLAN_DEBUG
-			mac_ctx->lim.gLim11bStaAssocRejectCount++;
-#endif
 			return false;
 		}
 	}
@@ -1280,20 +1277,6 @@ static bool lim_process_assoc_req_no_sta_ctx(struct mac_context *mac_ctx,
 	return true;
 }
 
-#ifdef WLAN_DEBUG
-static inline void
-lim_update_assoc_drop_count(struct mac_context *mac_ctx, uint8_t sub_type)
-{
-	if (sub_type == LIM_ASSOC)
-		mac_ctx->lim.gLimNumAssocReqDropInvldState++;
-	else
-		mac_ctx->lim.gLimNumReassocReqDropInvldState++;
-}
-#else
-static inline void
-lim_update_assoc_drop_count(struct mac_context *mac_ctx, uint8_t sub_type) {}
-#endif
-
 static inline void
 lim_delete_pmf_query_timer(tpDphHashNode sta_ds)
 {
@@ -1339,7 +1322,6 @@ static bool lim_process_assoc_req_sta_ctx(struct mac_context *mac_ctx,
 			 sta_ds->mlmStaContext.mlmState,
 			 lim_mlm_state_str(sta_ds->mlmStaContext.mlmState),
 			 sta_ds->sta_deletion_in_progress);
-		lim_update_assoc_drop_count(mac_ctx, sub_type);
 		return false;
 	}
 
@@ -1477,9 +1459,6 @@ static bool lim_chk_wmm(struct mac_context *mac_ctx, tSirMacAddr sa,
 					mac_ctx, REASON_NO_BANDWIDTH,
 					1, sa, sub_type, 0, session,
 					false);
-#ifdef WLAN_DEBUG
-				mac_ctx->lim.gLimNumAssocReqDropACRejectTS++;
-#endif
 				return false;
 			}
 		} else if (lim_admit_control_add_sta(mac_ctx, sa, false)
@@ -1488,9 +1467,6 @@ static bool lim_chk_wmm(struct mac_context *mac_ctx, tSirMacAddr sa,
 			lim_send_assoc_rsp_mgmt_frame(
 				mac_ctx, REASON_NO_BANDWIDTH, 1,
 				sa, sub_type, 0, session, false);
-#ifdef WLAN_DEBUG
-			mac_ctx->lim.gLimNumAssocReqDropACRejectSta++;
-#endif
 			return false;
 		}
 		/* else all ok */

core/mac/src/pe/lim/lim_process_beacon_frame.c

@@ -405,8 +405,6 @@ lim_process_beacon_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 	bool cu_flag = true;
 	QDF_STATUS status;
 
-	mac_ctx->lim.gLimNumBeaconsRcvd++;
-
 	/*
 	 * here is it required to increment session specific heartBeat
 	 * beacon counter

core/mac/src/pe/lim/lim_process_message_queue.c

@@ -1359,18 +1359,9 @@ lim_handle80211_frames(struct mac_context *mac, struct scheduler_msg *limMsg,
 			fc.protVer);
 		lim_pkt_free(mac, TXRX_FRM_802_11_MGMT, pRxPacketInfo,
 			     (void *)limMsg->bodyptr);
-#ifdef WLAN_DEBUG
-		mac->lim.numProtErr++;
-#endif
 		goto end;
 	}
 
-/* Chance of crashing : to be done BT-AMP ........happens when broadcast probe req is received */
-
-#ifdef WLAN_DEBUG
-	mac->lim.numMAC[fc.type][fc.subType]++;
-#endif
-
 	switch (fc.type) {
 	case SIR_MAC_MGMT_FRAME:
 	{
@@ -1600,9 +1591,6 @@ static void lim_process_messages(struct mac_context *mac_ctx,
 		return;
 	}
 
-#ifdef WLAN_DEBUG
-	mac_ctx->lim.numTot++;
-#endif
 	/*
 	 * MTRACE logs not captured for events received from SME
 	 * SME enums (eWNI_SME_START_REQ) starts with 0x16xx.
@@ -1632,11 +1620,8 @@ static void lim_process_messages(struct mac_context *mac_ctx,
 		lim_update_beacon(mac_ctx);
 		break;
 	case SIR_BB_XPORT_MGMT_MSG:
-		/* These messages are from Peer MAC entity. */
-#ifdef WLAN_DEBUG
-		mac_ctx->lim.numBbt++;
-#endif
-		/* The original msg which we were deferring have the
+		/* These messages are from Peer MAC entity.
+		 * The original msg which we were deferring have the
 		 * bodyPointer point to 'BD' instead of 'cds pkt'. If we
 		 * don't make a copy of msg, then overwrite the
 		 * msg->bodyPointer and next time when we try to
@@ -2201,9 +2186,6 @@ static void lim_process_normal_hdd_msg(struct mac_context *mac_ctx,
 		 * if radar is detected, Defer processing this message
 		 */
 		if (lim_defer_msg(mac_ctx, msg) != TX_SUCCESS) {
-#ifdef WLAN_DEBUG
-			mac_ctx->lim.numSme++;
-#endif
 			lim_log_session_states(mac_ctx);
 			/* Release body */
 			qdf_mem_free(msg->bodyptr);
@@ -2217,9 +2199,6 @@ static void lim_process_normal_hdd_msg(struct mac_context *mac_ctx,
 		 */
 		if (rsp_reqd)
 			mac_ctx->lim.gLimRspReqd = true;
-#ifdef WLAN_DEBUG
-		mac_ctx->lim.numSme++;
-#endif
 		if (lim_process_sme_req_messages(mac_ctx, msg)) {
 			/*
 			 * Release body. limProcessSmeReqMessage consumed the

core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c

@@ -1559,9 +1559,7 @@ void lim_process_sta_mlm_add_sta_rsp(struct mac_context *mac_ctx,
 			session_entry->limMlmState));
 		lim_process_add_sta_rsp_mlo(mac_ctx, &mlm_assoc_cnf,
 					    session_entry);
-#ifdef WLAN_DEBUG
-		mac_ctx->lim.gLimNumLinkEsts++;
-#endif
+
 #ifdef FEATURE_WLAN_TDLS
 		/* initialize TDLS peer related data */
 		lim_init_tdls_data(mac_ctx, session_entry);