From 33189d0e78b1fdaadd048010b0b1e82c2d1b4ce3 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Sat, 2 Sep 2017 17:46:43 -0700
Subject: [PATCH] qcacld-3.0: Remove obsolete csr_msg_processor() code

Currently csr_msg_processor() contains logic that is conditionally
compiled based upon ANI_RTT_DEBUG and ANI_EMUL_ASSOC. These are
obviously obsolete references since these are the only references in
the code, and since they are referencing a variable that is not
present in the function. Since these are obsolete, remove them.

Change-Id: Ie258f188dd2791be96f2e95fcf4e8a71c4ea44eb
CRs-Fixed: 2103630
---
 core/sme/src/csr/csr_cmd_process.c | 121 +++++++++++++----------------
 1 file changed, 56 insertions(+), 65 deletions(-)

diff --git a/core/sme/src/csr/csr_cmd_process.c b/core/sme/src/csr/csr_cmd_process.c
index 5a9dd8d6da25..c37f55773ce3 100644
--- a/core/sme/src/csr/csr_cmd_process.c
+++ b/core/sme/src/csr/csr_cmd_process.c
@@ -59,77 +59,68 @@ QDF_STATUS csr_msg_processor(tpAniSirGlobal mac_ctx, void *msg_buf)
 		session_id);
 
 	/* Process the message based on the state of the roaming states... */
-#if defined(ANI_RTT_DEBUG)
-	if (!pAdapter->fRttModeEnabled) {
-#endif
-		switch (cur_state) {
-		case eCSR_ROAMING_STATE_JOINED:
-			/* are we in joined state */
-			csr_roam_joined_state_msg_processor(mac_ctx, msg_buf);
-			break;
-		case eCSR_ROAMING_STATE_JOINING:
-			/* are we in roaming states */
-#if defined(ANI_EMUL_ASSOC)
-			emulRoamingStateMsgProcessor(pAdapter, pMBBufHdr);
-#endif
-			csr_roaming_state_msg_processor(mac_ctx, msg_buf);
-			break;
+	switch (cur_state) {
+	case eCSR_ROAMING_STATE_JOINED:
+		/* are we in joined state */
+		csr_roam_joined_state_msg_processor(mac_ctx, msg_buf);
+		break;
+	case eCSR_ROAMING_STATE_JOINING:
+		/* are we in roaming states */
+		csr_roaming_state_msg_processor(mac_ctx, msg_buf);
+		break;
 
-		default:
-			if (sme_rsp->messageType ==
-			    eWNI_SME_GET_STATISTICS_RSP) {
-				csr_roam_joined_state_msg_processor(mac_ctx,
-								    msg_buf);
-				break;
+	default:
+		if (sme_rsp->messageType ==
+		    eWNI_SME_GET_STATISTICS_RSP) {
+			csr_roam_joined_state_msg_processor(mac_ctx,
+							    msg_buf);
+			break;
+		}
+
+		/*
+		 * For all other messages, we ignore it
+		 * To work-around an issue where checking for set/remove
+		 * key base on connection state is no longer workable
+		 * due to failure or finding the condition meets both
+		 * SAP and infra/IBSS requirement.
+		 */
+		if (eWNI_SME_SETCONTEXT_RSP == sme_rsp->messageType) {
+			sme_warn("handling msg 0x%X CSR state is %d",
+				sme_rsp->messageType, cur_state);
+			csr_roam_check_for_link_status_change(mac_ctx,
+					sme_rsp);
+		} else if (eWNI_SME_GET_RSSI_REQ ==
+				sme_rsp->messageType) {
+			tAniGetRssiReq *pGetRssiReq =
+				(tAniGetRssiReq *) msg_buf;
+			if (NULL == pGetRssiReq->rssiCallback) {
+				sme_err("rssiCallback is NULL");
+				return status;
 			}
+			((tCsrRssiCallback)(pGetRssiReq->rssiCallback))(
+					pGetRssiReq->lastRSSI,
+					pGetRssiReq->staId,
+					pGetRssiReq->pDevContext);
+		} else {
+			sme_err("Message 0x%04X is not handled by CSR state is %d session Id %d",
+				sme_rsp->messageType, cur_state,
+				session_id);
 
-			/*
-			 * For all other messages, we ignore it
-			 * To work-around an issue where checking for set/remove
-			 * key base on connection state is no longer workable
-			 * due to failure or finding the condition meets both
-			 * SAP and infra/IBSS requirement.
-			 */
-			if (eWNI_SME_SETCONTEXT_RSP == sme_rsp->messageType) {
-				sme_warn("handling msg 0x%X CSR state is %d",
-					sme_rsp->messageType, cur_state);
-				csr_roam_check_for_link_status_change(mac_ctx,
-						sme_rsp);
-			} else if (eWNI_SME_GET_RSSI_REQ ==
+			if (eWNI_SME_FT_PRE_AUTH_RSP ==
 					sme_rsp->messageType) {
-				tAniGetRssiReq *pGetRssiReq =
-					(tAniGetRssiReq *) msg_buf;
-				if (NULL == pGetRssiReq->rssiCallback) {
-					sme_err("rssiCallback is NULL");
-					return status;
-				}
-				((tCsrRssiCallback)(pGetRssiReq->rssiCallback))(
-						pGetRssiReq->lastRSSI,
-						pGetRssiReq->staId,
-						pGetRssiReq->pDevContext);
-			} else {
-				sme_err("Message 0x%04X is not handled by CSR state is %d session Id %d",
-					sme_rsp->messageType, cur_state,
+				sme_err("Dequeue eSmeCommandRoam command with reason eCsrPerformPreauth");
+				csr_dequeue_roam_command(mac_ctx,
+					eCsrPerformPreauth, session_id);
+			} else if (eWNI_SME_REASSOC_RSP ==
+					sme_rsp->messageType) {
+				sme_err("Dequeue eSmeCommandRoam command with reason eCsrSmeIssuedFTReassoc");
+				csr_dequeue_roam_command(mac_ctx,
+					eCsrSmeIssuedFTReassoc,
 					session_id);
-
-				if (eWNI_SME_FT_PRE_AUTH_RSP ==
-						sme_rsp->messageType) {
-					sme_err("Dequeue eSmeCommandRoam command with reason eCsrPerformPreauth");
-					csr_dequeue_roam_command(mac_ctx,
-						eCsrPerformPreauth, session_id);
-				} else if (eWNI_SME_REASSOC_RSP ==
-						sme_rsp->messageType) {
-					sme_err("Dequeue eSmeCommandRoam command with reason eCsrSmeIssuedFTReassoc");
-					csr_dequeue_roam_command(mac_ctx,
-						eCsrSmeIssuedFTReassoc,
-						session_id);
-				}
 			}
-			break;
-		} /* switch */
-#if defined(ANI_RTT_DEBUG)
-	}
-#endif
+		}
+		break;
+	} /* switch */
 	return status;
 }