qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSirSmeDeauthCnf

Replace tSirMacAddr with cdf_mac_addr in tSirSmeDeauthCnf.

Change-Id: I16b399bcb76a6dd3fcc35c52e5822e988d4e5001
CRs-Fixed: 898864

core/mac/inc/sir_api.h

@@ -1402,8 +1402,8 @@ typedef struct sSirSmeDisassocCnf {
 	uint16_t messageType;   /* eWNI_SME_DISASSOC_CNF */
 	uint16_t length;
 	tSirResultCodes statusCode;
-	tSirMacAddr bssId;
-	tSirMacAddr peerMacAddr;
+	struct cdf_mac_addr bssid;
+	struct cdf_mac_addr peer_macaddr;
 } tSirSmeDisassocCnf, *tpSirSmeDisassocCnf,
 	tSirSmeDeauthCnf, *tpSirSmeDeauthCnf;
 

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

@@ -2603,7 +2603,7 @@ static void __lim_process_sme_disassoc_cnf(tpAniSirGlobal pMac, uint32_t *pMsgBu
 			sizeof(struct sSirSmeDisassocCnf));
 
 	psessionEntry = pe_find_session_by_bssid(pMac,
-				smeDisassocCnf.bssId,
+				smeDisassocCnf.bssid.bytes,
 				&sessionId);
 	if (psessionEntry == NULL) {
 		lim_log(pMac, LOGE,
@@ -2661,13 +2661,13 @@ static void __lim_process_sme_disassoc_cnf(tpAniSirGlobal pMac, uint32_t *pMsgBu
 	    (psessionEntry->limSmeState == eLIM_SME_WT_DEAUTH_STATE) ||
 	    LIM_IS_AP_ROLE(psessionEntry)) {
 		pStaDs = dph_lookup_hash_entry(pMac,
-				smeDisassocCnf.peerMacAddr, &aid,
+				smeDisassocCnf.peer_macaddr.bytes, &aid,
 				&psessionEntry->dph.dphHashTable);
 		if (pStaDs == NULL) {
 			lim_log(pMac, LOGE,
 				FL("DISASSOC_CNF for a STA with no context, addr= "
 				MAC_ADDRESS_STR),
-				MAC_ADDR_ARRAY(smeDisassocCnf.peerMacAddr));
+				MAC_ADDR_ARRAY(smeDisassocCnf.peer_macaddr.bytes));
 			return;
 		}
 
@@ -2677,7 +2677,7 @@ static void __lim_process_sme_disassoc_cnf(tpAniSirGlobal pMac, uint32_t *pMsgBu
 				eLIM_MLM_WT_DEL_STA_RSP_STATE)) {
 			lim_log(pMac, LOGE,
 				FL("No need of cleanup for addr:" MAC_ADDRESS_STR "as MLM state is %d"),
-				MAC_ADDR_ARRAY(smeDisassocCnf.peerMacAddr),
+				MAC_ADDR_ARRAY(smeDisassocCnf.peer_macaddr.bytes),
 				pStaDs->mlmStaContext.mlmState);
 			return;
 		}
@@ -2689,8 +2689,7 @@ static void __lim_process_sme_disassoc_cnf(tpAniSirGlobal pMac, uint32_t *pMsgBu
 		lim_cleanup_rx_path(pMac, pStaDs, psessionEntry);
 
 		lim_clean_up_disassoc_deauth_req(pMac,
-						 (char *)&smeDisassocCnf.peerMacAddr,
-						 0);
+				 (char *)&smeDisassocCnf.peer_macaddr, 0);
 	}
 
 	return;

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

@@ -618,7 +618,7 @@ lim_is_sme_disassoc_cnf_valid(tpAniSirGlobal pMac,
 			      tpSirSmeDisassocCnf pDisassocCnf,
 			      tpPESession psessionEntry)
 {
-	if (lim_is_group_addr(pDisassocCnf->peerMacAddr))
+	if (cdf_is_macaddr_group(&pDisassocCnf->peer_macaddr))
 		return false;
 
 	return true;

core/sme/src/csr/csr_api_roam.c

@@ -14284,16 +14284,17 @@ CDF_STATUS csr_send_mb_disassoc_cnf_msg(tpAniSirGlobal pMac,
 		pMsg->messageType = eWNI_SME_DISASSOC_CNF;
 		pMsg->statusCode = eSIR_SME_SUCCESS;
 		pMsg->length = sizeof(tSirSmeDisassocCnf);
-		cdf_mem_copy(pMsg->peerMacAddr, pDisassocInd->peerMacAddr,
-			     sizeof(pMsg->peerMacAddr));
+		cdf_mem_copy(pMsg->peer_macaddr.bytes,
+				pDisassocInd->peerMacAddr,
+				CDF_MAC_ADDR_SIZE);
 		status = CDF_STATUS_SUCCESS;
 		if (!CDF_IS_STATUS_SUCCESS(status)) {
 			cdf_mem_free(pMsg);
 			break;
 		}
 
-		cdf_mem_copy(pMsg->bssId, pDisassocInd->bssId,
-			     sizeof(pMsg->peerMacAddr));
+		cdf_mem_copy(pMsg->bssid.bytes, pDisassocInd->bssId,
+				CDF_MAC_ADDR_SIZE);
 		status = CDF_STATUS_SUCCESS;
 		if (!CDF_IS_STATUS_SUCCESS(status)) {
 			cdf_mem_free(pMsg);
@@ -14322,15 +14323,14 @@ CDF_STATUS csr_send_mb_deauth_cnf_msg(tpAniSirGlobal pMac,
 		pMsg->messageType = eWNI_SME_DEAUTH_CNF;
 		pMsg->statusCode = eSIR_SME_SUCCESS;
 		pMsg->length = sizeof(tSirSmeDeauthCnf);
-		cdf_mem_copy(pMsg->bssId, pDeauthInd->bssid.bytes,
-			     CDF_MAC_ADDR_SIZE);
+		cdf_copy_macaddr(&pMsg->bssid, &pDeauthInd->bssid);
 		status = CDF_STATUS_SUCCESS;
 		if (!CDF_IS_STATUS_SUCCESS(status)) {
 			cdf_mem_free(pMsg);
 			break;
 		}
-		cdf_mem_copy(pMsg->peerMacAddr, pDeauthInd->peer_macaddr.bytes,
-			     CDF_MAC_ADDR_SIZE);
+		cdf_copy_macaddr(&pMsg->peer_macaddr,
+				 &pDeauthInd->peer_macaddr);
 		status = CDF_STATUS_SUCCESS;
 		if (!CDF_IS_STATUS_SUCCESS(status)) {
 			cdf_mem_free(pMsg);