commit 1a245364d6eaef3300f729a5f886d03821837446
author Srinivas Girigowda <sgirigow@qca.qualcomm.com> Tue Jan 05 22:43:30 2016 -0800
committer Akash Patel <akashp@codeaurora.org> Mon Feb 08 15:50:42 2016 -0800
tree 1b917aa4a2b80b3e9220c55971d9ac6774188a5b
parent dd3c513e76e8528c44e64b82d56a0e474f7cce07

qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSirSmeDisassocReq

Replace tSirMacAddr with cdf_mac_addr in tSirSmeDisassocReq.

Change-Id: I9d0b77e0ce624c48ca0fea2774c0f63285793cee
CRs-Fixed: 898864

core/mac/src/pe/lim/lim_process_sme_req_messages.c

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 d087d9d..b3ddfcd 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
@@ -2396,13 +2396,13 @@
 	}
 
 	psessionEntry = pe_find_session_by_bssid(pMac,
-				smeDisassocReq.bssId,
+				smeDisassocReq.bssid.bytes,
 				&sessionId);
 	if (psessionEntry == NULL) {
 		lim_log(pMac, LOGE,
 			FL("session does not exist for given bssId "
 			   MAC_ADDRESS_STR),
-			MAC_ADDR_ARRAY(smeDisassocReq.bssId));
+			MAC_ADDR_ARRAY(smeDisassocReq.bssid.bytes));
 		retCode = eSIR_SME_INVALID_PARAMETERS;
 		disassocTrigger = eLIM_HOST_DISASSOC;
 		goto sendDisassoc;
@@ -2412,7 +2412,7 @@
 			MAC_ADDRESS_STR), smesessionId,
 		GET_LIM_SYSTEM_ROLE(psessionEntry), smeDisassocReq.reasonCode,
 		pMac->lim.gLimSmeState,
-		MAC_ADDR_ARRAY(smeDisassocReq.peerMacAddr));
+		MAC_ADDR_ARRAY(smeDisassocReq.peer_macaddr.bytes));
 
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM    /* FEATURE_WLAN_DIAG_SUPPORT */
 	lim_diag_event_report(pMac, WLAN_PE_DIAG_DISASSOC_REQ_EVENT, psessionEntry,
@@ -2549,9 +2549,8 @@
 		return;
 	}
 
-	cdf_mem_copy((uint8_t *) &pMlmDisassocReq->peer_macaddr,
-		     (uint8_t *) &smeDisassocReq.peerMacAddr,
-		     sizeof(tSirMacAddr));
+	cdf_copy_macaddr(&pMlmDisassocReq->peer_macaddr,
+			 &smeDisassocReq.peer_macaddr);
 
 	pMlmDisassocReq->reasonCode = reasonCode;
 	pMlmDisassocReq->disassocTrigger = disassocTrigger;
@@ -2565,16 +2564,17 @@
 
 sendDisassoc:
 	if (psessionEntry)
-		lim_send_sme_disassoc_ntf(pMac, smeDisassocReq.peerMacAddr,
+		lim_send_sme_disassoc_ntf(pMac,
+					  smeDisassocReq.peer_macaddr.bytes,
 					  retCode,
 					  disassocTrigger,
 					  1, smesessionId, smetransactionId,
 					  psessionEntry);
 	else
-		lim_send_sme_disassoc_ntf(pMac, smeDisassocReq.peerMacAddr,
-					  retCode,
-					  disassocTrigger,
-					  1, smesessionId, smetransactionId, NULL);
+		lim_send_sme_disassoc_ntf(pMac,
+					  smeDisassocReq.peer_macaddr.bytes,
+					  retCode, disassocTrigger, 1,
+					  smesessionId, smetransactionId, NULL);
 
 } /*** end __lim_process_sme_disassoc_req() ***/