From aac14e0ac60b3ee80da743cad5237a7985bea47d Mon Sep 17 00:00:00 2001
From: Jianmin Zhu <jianminz@codeaurora.org>
Date: Fri, 31 Aug 2018 23:00:27 +0800
Subject: [PATCH] qcacld-3.0: Remove useless legacy roam reason
 eCsrLostLink1/2/3

1. Remove eCsrLostLink1/2/3 from csr_roam_reason.
2. Remove eCsrLostLink1/2/3 from csr_get_roam_cmd_type.
3. Remove csr_set_abort_roaming_command
4. Remove CSR_IS_ROAMING_COMMAND

Change-Id: Ibcc5dc63739b2764301f5a35a2110d570bc3928e
CRs-Fixed: 2308267
---
 core/sme/inc/csr_internal.h     |  9 ------
 core/sme/src/csr/csr_api_roam.c | 51 +--------------------------------
 2 files changed, 1 insertion(+), 59 deletions(-)

diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h
index ecbdbbc2fd63..49d65d392bb7 100644
--- a/core/sme/inc/csr_internal.h
+++ b/core/sme/inc/csr_internal.h
@@ -118,10 +118,6 @@ enum csr_roam_reason {
 	eCsrForcedDisassoc,
 	/* roaming because an 802.11 request was issued to the driver. */
 	eCsrHddIssued,
-	/* roaming because we lost link to an associated AP */
-	eCsrLostLink1,
-	eCsrLostLink2,
-	eCsrLostLink3,
 	/* roaming because we need to force a Disassoc due to MIC failure */
 	eCsrForcedDisassocMICFailure,
 	eCsrHddIssuedReassocToSameAP,
@@ -1139,11 +1135,6 @@ struct csr_roamstruct {
 	((eCsrLostlinkRoamingDisassoc == (reason)) || \
 		(eCsrLostlinkRoamingDeauth == (reason)))
 
-#define CSR_IS_ROAMING_COMMAND(pCommand) \
-		((eCsrLostLink1 == (pCommand)->u.roamCmd.roamReason) || \
-			(eCsrLostLink2 == (pCommand)->u.roamCmd.roamReason) || \
-			(eCsrLostLink3 == (pCommand)->u.roamCmd.roamReason))
-
 #ifdef FEATURE_LFR_SUBNET_DETECTION
 /* bit-4 and bit-5 indicate the subnet status */
 #define CSR_GET_SUBNET_STATUS(roam_reason) (((roam_reason) & 0x30) >> 4)
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 38e6f4530014..869c6d899ecd 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -5935,26 +5935,6 @@ static void csr_roam_assign_default_param(tpAniSirGlobal pMac,
 		encryptionType[0];
 }
 
-static void csr_set_abort_roaming_command(tpAniSirGlobal pMac,
-					tSmeCmd *pCommand)
-{
-	switch (pCommand->u.roamCmd.roamReason) {
-	case eCsrLostLink1:
-		pCommand->u.roamCmd.roamReason = eCsrLostLink1;
-		break;
-	case eCsrLostLink2:
-		pCommand->u.roamCmd.roamReason = eCsrLostLink2;
-		break;
-	case eCsrLostLink3:
-		pCommand->u.roamCmd.roamReason = eCsrLostLink3;
-		break;
-	default:
-		sme_err("aborting roaming reason %d not recognized",
-			pCommand->u.roamCmd.roamReason);
-		break;
-	}
-}
-
 /**
  * csr_roam_select_bss() - Handle join scenario based on profile
  * @mac_ctx:             Global MAC Context
@@ -6074,15 +6054,7 @@ static void csr_roam_join_handle_profile(tpAniSirGlobal mac_ctx,
 				eCSR_ROAM_ASSOCIATION_COMPLETION,
 				eCSR_ROAM_RESULT_NOT_ASSOCIATED);
 		}
-		/* If roaming has stopped, don't continue the roaming command */
-		if (!CSR_IS_ROAMING(session) && CSR_IS_ROAMING_COMMAND(cmd)) {
-			/* No need to complete roaming as it already complete */
-			sme_debug("Roam cmd(reason %d)aborted as roam complete",
-				  cmd->u.roamCmd.roamReason);
-			*roam_state = eCsrStopRoaming;
-			csr_set_abort_roaming_command(mac_ctx, cmd);
-			return;
-		}
+
 		qdf_mem_set(roam_info_ptr, sizeof(struct csr_roam_info), 0);
 		if (!scan_result)
 			cmd->u.roamCmd.roamProfile.uapsd_mask = 0;
@@ -9980,18 +9952,6 @@ csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx,
 		return;
 	}
 
-	/* If the roaming has stopped, not to continue the roaming command */
-	if (!CSR_IS_ROAMING(session) && CSR_IS_ROAMING_COMMAND(cmd)) {
-		/* No need to complete roaming here as it already completes */
-		sme_warn(
-			"Roam cmd (reason %d) aborted(roaming completed)",
-			cmd->u.roamCmd.roamReason);
-		csr_set_abort_roaming_command(mac_ctx, cmd);
-		csr_roam_complete(mac_ctx, eCsrNothingToJoin, NULL,
-				sme_session_id);
-		return;
-	}
-
 	if (!QDF_IS_STATUS_SUCCESS(result)) {
 		/*
 		 * In the event the configuration failed, for infra let the roam
@@ -20486,15 +20446,6 @@ static enum wlan_serialization_cmd_type csr_get_roam_cmd_type(
 	case eCsrHddIssued:
 		cmd_type = WLAN_SER_CMD_HDD_ISSUED;
 		break;
-	case eCsrLostLink1:
-		cmd_type = WLAN_SER_CMD_LOST_LINK1;
-		break;
-	case eCsrLostLink2:
-		cmd_type = WLAN_SER_CMD_LOST_LINK2;
-		break;
-	case eCsrLostLink3:
-		cmd_type = WLAN_SER_CMD_LOST_LINK3;
-		break;
 	case eCsrForcedDisassocMICFailure:
 		cmd_type = WLAN_SER_CMD_FORCE_DISASSOC_MIC_FAIL;
 		break;