From 99faf48d43c84e3dd46e2ada43032c158627719d Mon Sep 17 00:00:00 2001
From: Srinivas Girigowda <sgirigow@qca.qualcomm.com>
Date: Thu, 3 Dec 2015 19:06:15 -0800
Subject: [PATCH] qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in
 sSirAggrQosReq

Replace tSirMacAddr with cdf_mac_addr in struct sSirAggrQosReq.

Change-Id: I1f58cf95eb3028ef763cd624fa05dcdc288d820e
CRs-Fixed: 898864
---
 core/mac/inc/sir_api.h       | 2 +-
 core/mac/src/pe/lim/lim_ft.c | 6 +++---
 core/sme/src/qos/sme_qos.c   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 9eb12a0dbb15..c385c10ce89b 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -2048,7 +2048,7 @@ typedef struct sSirAggrQosReq {
 	uint16_t length;
 	uint8_t sessionId;      /* Session ID */
 	uint16_t transactionId;
-	tSirMacAddr bssId;      /* BSSID */
+	struct cdf_mac_addr bssid;      /* BSSID */
 	uint32_t timeout;       /* in ms */
 	uint8_t rspReqd;
 	tSirAggrQosReqInfo aggrInfo;
diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c
index 92769e8bb12d..c7d7f6ab53a7 100644
--- a/core/mac/src/pe/lim/lim_ft.c
+++ b/core/mac/src/pe/lim/lim_ft.c
@@ -1850,8 +1850,8 @@ tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf
 		return eSIR_MEM_ALLOC_FAILED;
 	}
 
-	psessionEntry =
-		pe_find_session_by_bssid(pMac, aggrQosReq->bssId, &sessionId);
+	psessionEntry = pe_find_session_by_bssid(pMac, aggrQosReq->bssid.bytes,
+						 &sessionId);
 
 	if (psessionEntry == NULL) {
 		PELOGE(lim_log
@@ -1874,7 +1874,7 @@ tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf
 		return eSIR_FAILURE;
 	}
 
-	pSta = dph_lookup_hash_entry(pMac, aggrQosReq->bssId, &aid,
+	pSta = dph_lookup_hash_entry(pMac, aggrQosReq->bssid.bytes, &aid,
 				     &psessionEntry->dph.dphHashTable);
 	if (pSta == NULL) {
 		PELOGE(lim_log(pMac, LOGE,
diff --git a/core/sme/src/qos/sme_qos.c b/core/sme/src/qos/sme_qos.c
index 1595a08cce62..52e64bf3edc1 100644
--- a/core/sme/src/qos/sme_qos.c
+++ b/core/sme/src/qos/sme_qos.c
@@ -3472,7 +3472,7 @@ CDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id)
 	aggr_req->sessionId = session_id;
 	aggr_req->timeout = 0;
 	aggr_req->rspReqd = true;
-	cdf_mem_copy(&aggr_req->bssId[0],
+	cdf_mem_copy(&aggr_req->bssid.bytes[0],
 		     &session->assocInfo.pBssDesc->bssId[0],
 		     sizeof(struct cdf_mac_addr));