commit 1e24247c883cc6a69bf6fe1f02c27ab77c9e8178
author Service qcabuildsw <qcabuildsw@localhost> Mon Mar 27 19:10:07 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Mar 27 19:10:07 2017 -0700
tree 767776b71b96879a707f585178b2b7cc83730e8c
parent 7752aa1d63d0045873feb96193b7d5722790f801
parent eab5824f37125ddc52ba67b34e701f9e55368ac7

Merge "qcacld-3.0: Check for adapter validity in IPA deinit" into wlan-cld3.driver.lnx.2.0-dev

core/sap/src/sap_api_link_cntl.c

diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c
index 0d6cb67..a2ca456 100644
--- a/core/sap/src/sap_api_link_cntl.c
+++ b/core/sap/src/sap_api_link_cntl.c
@@ -1197,6 +1197,7 @@
 		 */
 		sap_event.event = eSAP_MAC_START_BSS_SUCCESS;
 		sap_event.params = csr_roam_info;
+		sap_ctx->sap_sta_id = csr_roam_info->staId;
 		sap_event.u1 = roam_status;
 		sap_event.u2 = roam_result;
 		qdf_status = sap_fsm(sap_ctx, &sap_event);

core/sap/src/sap_fsm.c

diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c
index 76056e7..09d9639 100644
--- a/core/sap/src/sap_fsm.c
+++ b/core/sap/src/sap_fsm.c
@@ -2874,10 +2874,7 @@
 		bss_complete = &sap_ap_event.sapevt.sapStartBssCompleteEvent;
 
 		bss_complete->status = (eSapStatus) context;
-		if (csr_roaminfo != NULL)
-			bss_complete->staId = csr_roaminfo->staId;
-		else
-			bss_complete->staId = 0;
+		bss_complete->staId = sap_ctx->sap_sta_id;
 
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("(eSAP_START_BSS_EVENT): staId = %d"),

core/sap/src/sap_internal.h

diff --git a/core/sap/src/sap_internal.h b/core/sap/src/sap_internal.h
index b0ba389..b801a85 100644
--- a/core/sap/src/sap_internal.h
+++ b/core/sap/src/sap_internal.h
@@ -279,6 +279,7 @@
 	enum sap_acs_dfs_mode dfs_mode;
 	wlan_scan_requester req_id;
 	uint8_t sap_acs_pre_start_bss;
+	uint8_t sap_sta_id;
 } *ptSapContext;
 
 /*----------------------------------------------------------------------------