From c8b79e4170dcf121bbc64d887ee53bfbf2216057 Mon Sep 17 00:00:00 2001
From: Srinivas Girigowda <sgirigow@qca.qualcomm.com>
Date: Thu, 24 Sep 2015 15:57:40 -0700
Subject: [PATCH] qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in
 sSirSmeTkipCntrMeasReq

Replace tSirMacAddr with cdf_mac_addr in sSirSmeTkipCntrMeasReq.

Change-Id: I404f7b7976b8d3096e9a8963710a019e8671b1fe
CRs-Fixed: 898864
---
 core/mac/inc/sir_api.h                        |  2 +-
 .../src/pe/lim/lim_process_sme_req_messages.c |  3 +-
 core/sme/src/csr/csr_api_roam.c               | 55 ++++++++++---------
 core/sme/src/csr/csr_inside_api.h             |  4 --
 4 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 4c66990e7ca1..177290de5e80 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -1208,7 +1208,7 @@ typedef struct sSirSmeTkipCntrMeasReq {
 	uint16_t length;
 	uint8_t sessionId;      /* Session ID */
 	uint16_t transactionId; /* Transaction ID for cmd */
-	tSirMacAddr bssId;      /* Peer BSSID */
+	struct cdf_mac_addr bssId; /* Peer BSSID */
 	bool bEnable;           /* Start/stop countermeasures */
 } cdf_packed tSirSmeTkipCntrMeasReq, *tpSirSmeTkipCntrMeasReq;
 
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 9a02530c3044..0494579e128b 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
@@ -3354,8 +3354,7 @@ void lim_process_tkip_counter_measures(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
 			sizeof(struct sSirSmeTkipCntrMeasReq));
 
 	psessionEntry = pe_find_session_by_bssid(pMac,
-				tkipCntrMeasReq.bssId,
-				&sessionId);
+				tkipCntrMeasReq.bssId.bytes, &sessionId);
 	if (NULL == psessionEntry) {
 		lim_log(pMac, LOGE,
 			FL("session does not exist for given BSSID "));
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 0d93d573c088..9cc469da3366 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -3061,6 +3061,33 @@ CDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac,
 	return status;
 }
 
+static CDF_STATUS
+csr_send_mb_tkip_counter_measures_req_msg(tpAniSirGlobal pMac,
+					  uint32_t sessionId, bool bEnable,
+					  struct cdf_mac_addr *bssId)
+{
+	CDF_STATUS status = CDF_STATUS_SUCCESS;
+	tSirSmeTkipCntrMeasReq *pMsg;
+	do {
+		pMsg = cdf_mem_malloc(sizeof(tSirSmeTkipCntrMeasReq));
+		if (NULL == pMsg)
+			status = CDF_STATUS_E_NOMEM;
+		else
+			status = CDF_STATUS_SUCCESS;
+		if (!CDF_IS_STATUS_SUCCESS(status))
+			break;
+		cdf_mem_set(pMsg, sizeof(tSirSmeTkipCntrMeasReq), 0);
+		pMsg->messageType = eWNI_SME_TKIP_CNTR_MEAS_REQ;
+		pMsg->length = sizeof(tSirSmeTkipCntrMeasReq);
+		pMsg->sessionId = sessionId;
+		pMsg->transactionId = 0;
+		cdf_copy_macaddr(&pMsg->bssId, bssId);
+		pMsg->bEnable = bEnable;
+		status = cds_send_mb_message_to_mac(pMsg);
+	} while (0);
+	return status;
+}
+
 CDF_STATUS
 csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, uint32_t sessionId,
 				     bool bEnable)
@@ -3086,7 +3113,7 @@ csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, uint32_t sessionId,
 		", Enable = %d", MAC_ADDR_ARRAY(bssId.bytes), bEnable);
 	status =
 		csr_send_mb_tkip_counter_measures_req_msg(pMac, sessionId,
-							bEnable, bssId.bytes);
+							bEnable, &bssId);
 	return status;
 }
 
@@ -14155,32 +14182,6 @@ CDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
 	return cds_send_mb_message_to_mac(pMsg);
 }
 
-CDF_STATUS csr_send_mb_tkip_counter_measures_req_msg(tpAniSirGlobal pMac,
-						     uint32_t sessionId, bool bEnable,
-						     tSirMacAddr bssId)
-{
-	CDF_STATUS status = CDF_STATUS_SUCCESS;
-	tSirSmeTkipCntrMeasReq *pMsg;
-	do {
-		pMsg = cdf_mem_malloc(sizeof(tSirSmeTkipCntrMeasReq));
-		if (NULL == pMsg)
-			status = CDF_STATUS_E_NOMEM;
-		else
-			status = CDF_STATUS_SUCCESS;
-		if (!CDF_IS_STATUS_SUCCESS(status))
-			break;
-		cdf_mem_set(pMsg, sizeof(tSirSmeTkipCntrMeasReq), 0);
-		pMsg->messageType = eWNI_SME_TKIP_CNTR_MEAS_REQ;
-		pMsg->length = sizeof(tSirSmeTkipCntrMeasReq);
-		pMsg->sessionId = sessionId;
-		pMsg->transactionId = 0;
-		cdf_mem_copy(pMsg->bssId, bssId, sizeof(tSirMacAddr));
-		pMsg->bEnable = bEnable;
-		status = cds_send_mb_message_to_mac(pMsg);
-	} while (0);
-	return status;
-}
-
 CDF_STATUS
 csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
 					CDF_MODULE_ID modId, tSirMacAddr bssId,
diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h
index 0f21bec8a2b7..3896db080f46 100644
--- a/core/sme/src/csr/csr_inside_api.h
+++ b/core/sme/src/csr/csr_inside_api.h
@@ -956,10 +956,6 @@ CDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac,
 CDF_STATUS csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac,
 						uint32_t sessionId, bool bEnable);
 
-CDF_STATUS csr_send_mb_tkip_counter_measures_req_msg(tpAniSirGlobal pMac,
-						     uint32_t sessinId, bool bEnable,
-						     tSirMacAddr bssId);
-
 /* ---------------------------------------------------------------------------
     \fn csr_roam_get_associated_stas
     \brief csr function that HDD calls to get list of associated stations based on module ID