From 5d4860029f0075603cd37fe4b25b724b8e90aeeb Mon Sep 17 00:00:00 2001
From: Srinivas Girigowda <sgirigow@qca.qualcomm.com>
Date: Wed, 25 Nov 2015 12:18:44 -0800
Subject: [PATCH] qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in
 tSirUpdateAPWPSIEsReq

Replace tSirMacAddr with cdf_mac_addr in tSirUpdateAPWPSIEsReq.

Change-Id: Ia6d8ea2523257caac541c84d10b7e6a81afc606b
CRs-Fixed: 898864
---
 core/mac/inc/sir_api.h                        |  2 +-
 .../src/pe/lim/lim_process_sme_req_messages.c |  2 +-
 core/sme/src/csr/csr_api_roam.c               | 29 +++++++++----------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index fdf0b749fcde..9e1501fc4ba8 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -2446,7 +2446,7 @@ typedef struct sSirUpdateAPWPSIEsReq {
 	uint16_t messageType;   /* eWNI_SME_UPDATE_APWPSIE_REQ */
 	uint16_t length;
 	uint16_t transactionId; /* Transaction ID for cmd */
-	tSirMacAddr bssId;      /* BSSID */
+	struct cdf_mac_addr bssid;      /* BSSID */
 	uint8_t sessionId;      /* Session ID */
 	tSirAPWPSIEs APWPSIEs;
 } tSirUpdateAPWPSIEsReq, *tpSirUpdateAPWPSIEsReq;
diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
index ad1cea7239c9..8e15c31d45a3 100644
--- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
@@ -4106,7 +4106,7 @@ __lim_process_sme_update_apwpsi_es(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
 			sizeof(struct sSirUpdateAPWPSIEsReq));
 
 	psessionEntry = pe_find_session_by_bssid(pMac,
-				pUpdateAPWPSIEsReq->bssId,
+				pUpdateAPWPSIEsReq->bssid.bytes,
 				&sessionId);
 	if (psessionEntry == NULL) {
 		lim_log(pMac, LOGW,
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index ceca2cdcdd11..d6e8468150d8 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -17603,26 +17603,23 @@ CDF_STATUS csr_roam_update_apwpsie(tpAniSirGlobal pMac, uint32_t sessionId,
 	tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId);
 	if (NULL == pSession) {
 		sms_log(pMac, LOGE,
-			FL("  Session does not exist for session id %d"),
+			FL("Session does not exist for session id %d"),
 			sessionId);
 		return CDF_STATUS_E_FAILURE;
 	}
 
-	do {
-		pMsg = cdf_mem_malloc(sizeof(tSirUpdateAPWPSIEsReq));
-		if (NULL == pMsg)
-			return CDF_STATUS_E_NOMEM;
-		cdf_mem_set(pMsg, sizeof(tSirUpdateAPWPSIEsReq), 0);
-		pMsg->messageType = eWNI_SME_UPDATE_APWPSIE_REQ;
-		pMsg->transactionId = 0;
-		cdf_mem_copy(pMsg->bssId, &pSession->selfMacAddr,
-				sizeof(tSirMacAddr));
-		pMsg->sessionId = sessionId;
-		cdf_mem_copy(&pMsg->APWPSIEs, pAPWPSIES,
-				sizeof(tSirAPWPSIEs));
-		pMsg->length = sizeof(struct sSirUpdateAPWPSIEsReq);
-		status = cds_send_mb_message_to_mac(pMsg);
-	} while (0);
+	pMsg = cdf_mem_malloc(sizeof(*pMsg));
+	if (NULL == pMsg)
+		return CDF_STATUS_E_NOMEM;
+
+	pMsg->messageType = eWNI_SME_UPDATE_APWPSIE_REQ;
+	pMsg->transactionId = 0;
+	cdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr);
+	pMsg->sessionId = sessionId;
+	cdf_mem_copy(&pMsg->APWPSIEs, pAPWPSIES, sizeof(tSirAPWPSIEs));
+	pMsg->length = sizeof(*pMsg);
+	status = cds_send_mb_message_to_mac(pMsg);
+
 	return status;
 }