qcacld-3.0: Wait for vdev stop rsp before next connect

As part of connect, when Probe resp/beacon from AP is not received,
vdev stop is sent to firmware. PE session is deleted and join rsp
is sent to sme after posting vdev stop command without waiting for
vdev stop response from firmware. SME will try to connect to next
BSS and host sends create peer to firmware. Firmware is not yet
done with vdev stop and panics.

To fix this, add callback function in lim_set_link_state to inform
when vdev stop resp from firmware is received. Upon reception of
this do the PE session clean up and send join resp to SME.

Change-Id: I43665f14736472da8da70b9c87361be769de7fac
CRs-Fixed: 1112551

2 files changed, 58 insertions, 7 deletions

diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h
index a7c3bd71cc72..48f809e6d1da 100644
--- a/core/mac/src/pe/include/lim_session.h
+++ b/core/mac/src/pe/include/lim_session.h
@@ -90,6 +90,12 @@ typedef struct {
 	uint8_t gHTObssMode;
 } tBeaconParams, *tpBeaconParams;
 
+typedef struct join_params {
+	uint16_t prot_status_code;
+	uint16_t pe_session_id;
+	tSirResultCodes result_code;
+} join_params;
+
 typedef struct sPESession       /* Added to Support BT-AMP */
 {
 	/* To check session table is in use or free */
diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
index 3b6babaaf348..de0daa941541 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -1338,6 +1338,46 @@ void lim_process_mlm_set_keys_cnf(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
 } /*** end lim_process_mlm_set_keys_cnf() ***/
 
 /**
+ * lim_join_result_callback() - Callback to handle join rsp
+ * @mac: Pointer to Global MAC structure
+ * @param: callback argument
+ * @status: status
+ *
+ * This callback function is used to delete PE session
+ * entry and send join response to sme.
+ *
+ * Return: None
+ */
+static void lim_join_result_callback(tpAniSirGlobal mac, void *param,
+				     bool status)
+{
+	join_params *link_state_params = (join_params *) param;
+	tpPESession session;
+	uint8_t sme_session_id;
+	uint16_t sme_trans_id;
+
+	if (!link_state_params) {
+		lim_log(mac, LOGE,
+			FL("Link state params is NULL"));
+		return;
+	}
+	session = pe_find_session_by_session_id(mac, link_state_params->
+						pe_session_id);
+	if (!session) {
+		qdf_mem_free(link_state_params);
+		return;
+	}
+	sme_session_id = session->smeSessionId;
+	sme_trans_id = session->transactionId;
+	lim_send_sme_join_reassoc_rsp(mac, eWNI_SME_JOIN_RSP,
+				      link_state_params->result_code,
+				      link_state_params->prot_status_code,
+				      NULL, sme_session_id, sme_trans_id);
+	pe_delete_session(mac, session);
+	qdf_mem_free(link_state_params);
+}
+
+/**
  * lim_handle_sme_join_result() - Handles sme join result
  * @mac_ctx:  Pointer to Global MAC structure
  * @result_code: Failure code to be sent
@@ -1358,6 +1398,7 @@ void lim_handle_sme_join_result(tpAniSirGlobal mac_ctx,
 	tpDphHashNode sta_ds = NULL;
 	uint8_t sme_session_id;
 	uint16_t sme_trans_id;
+	join_params *param = NULL;
 
 	if (session_entry == NULL) {
 		lim_log(mac_ctx, LOGE, FL("psessionEntry is NULL "));
@@ -1403,15 +1444,19 @@ void lim_handle_sme_join_result(tpAniSirGlobal mac_ctx,
 error:
 	/* Delete the session if JOIN failure occurred. */
 	if (result_code != eSIR_SME_SUCCESS) {
+		param = qdf_mem_malloc(sizeof(join_params));
+		if (param != NULL) {
+			param->result_code = result_code;
+			param->prot_status_code = prot_status_code;
+			param->pe_session_id = session_entry->peSessionId;
+		}
 		if (lim_set_link_state
-			(mac_ctx, eSIR_LINK_DOWN_STATE,
-			session_entry->bssId,
-			session_entry->selfMacAddr, NULL,
-			NULL) != eSIR_SUCCESS)
+			(mac_ctx, eSIR_LINK_DOWN_STATE, session_entry->bssId,
+			 session_entry->selfMacAddr, lim_join_result_callback,
+			 param) != eSIR_SUCCESS)
 			lim_log(mac_ctx, LOGE,
 				FL("Failed to set the LinkState."));
-		pe_delete_session(mac_ctx, session_entry);
-		session_entry = NULL;
+		return;
 	}
 
 	lim_send_sme_join_reassoc_rsp(mac_ctx, eWNI_SME_JOIN_RSP, result_code,