qcacld-3.0: Reintroduce eCSR_ASSOC_STATE_TYPE_INFRA_DISCONNECTING

This state ensures that host will not issue connect from scan for
ssid completion. Thus if this fresh connect also issue scan for
ssid, then host drops connect command assuming disconnect is in
progress. If host gets disconnect request in between the scan for
SSID of previous connect request, host aborts scan and host blocks
next commands till the sme disconnect timeout.

Change-Id: Ia42332dfef73e4b6ea8f348894427e5fe81eac1d
CRs-Fixed: 2865047

core/sme/inc/csr_api.h

@@ -493,7 +493,10 @@ typedef enum {
 	eCSR_CONNECT_STATE_TYPE_NDI_NOT_STARTED,
 	/* NAN Data interface started */
 	eCSR_CONNECT_STATE_TYPE_NDI_STARTED,
-
+#ifndef FEATURE_CM_ENABLE
+	/* Disconnecting with AP or stop connecting process */
+	eCSR_ASSOC_STATE_TYPE_INFRA_DISCONNECTING,
+#endif
 } eCsrConnectState;
 
 /*

core/sme/src/csr/csr_api_roam.c

@@ -7246,6 +7246,20 @@ QDF_STATUS csr_roam_connect(struct mac_context *mac, uint32_t sessionId,
 					eCSR_DISCONNECT_REASON_UNSPECIFIED,
 					REASON_UNSPEC_FAILURE);
 
+	/*
+	 * If roamSession.connectState is disconnecting that mean
+	 * disconnect was received with scan for ssid in progress
+	 * and dropped. This state will ensure that connect will
+	 * not be issued from scan for ssid completion. Thus
+	 * if this fresh connect also issue scan for ssid the connect
+	 * command will be dropped assuming disconnect is in progress.
+	 * Thus reset connectState here
+	 */
+	if (mac->roam.roamSession[sessionId].connectState ==
+	    eCSR_ASSOC_STATE_TYPE_INFRA_DISCONNECTING)
+		mac->roam.roamSession[sessionId].connectState =
+			eCSR_ASSOC_STATE_TYPE_NOT_CONNECTED;
+
 	filter = qdf_mem_malloc(sizeof(*filter));
 	if (!filter) {
 		status = QDF_STATUS_E_NOMEM;
@@ -7783,9 +7797,17 @@ QDF_STATUS csr_roam_disconnect(struct mac_context *mac_ctx, uint32_t session_id,
 
 	if (csr_is_conn_state_connected(mac_ctx, session_id)
 	    || csr_is_roam_command_waiting_for_session(mac_ctx, session_id)
-	    || CSR_IS_CONN_NDI(&session->connectedProfile))
+	    || CSR_IS_CONN_NDI(&session->connectedProfile)) {
 		status = csr_roam_issue_disassociate_cmd(mac_ctx, session_id,
 							 reason, mac_reason);
+	} else if (session->scan_info.profile) {
+		mac_ctx->roam.roamSession[session_id].connectState =
+				eCSR_ASSOC_STATE_TYPE_INFRA_DISCONNECTING;
+		csr_scan_abort_mac_scan(mac_ctx, session_id, INVAL_SCAN_ID);
+		status = QDF_STATUS_CMD_NOT_QUEUED;
+		sme_debug("Disconnect cmd not queued, Roam command is not present return with status %d",
+			  status);
+	}
 #else
 	if (CSR_IS_CONN_NDI(&session->connectedProfile))
 		status = csr_roam_issue_disassociate_cmd(mac_ctx, session_id,

core/sme/src/csr/csr_api_scan.c

@@ -174,6 +174,12 @@ QDF_STATUS csr_scan_handle_search_for_ssid(struct mac_context *mac_ctx,
 		qdf_mem_free(filter);
 		if (!QDF_IS_STATUS_SUCCESS(status))
 			break;
+		if (mac_ctx->roam.roamSession[session_id].connectState ==
+		    eCSR_ASSOC_STATE_TYPE_INFRA_DISCONNECTING) {
+			sme_err("upper layer issued disconnetion");
+			status = QDF_STATUS_E_FAILURE;
+			break;
+		}
 
 		status = csr_roam_issue_connect(mac_ctx, session_id, profile,
 						hBSSList, eCsrHddIssued,