Parcourir la source

qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSirTdlsEventnotify

Replace tSirMacAddr with cdf_mac_addr in sSirTdlsEventnotify

Change-Id: Ia78eeffd98821ea075df0838dc7ff4367ce0ca36
CRs-Fixed: 898864
Srinivas Girigowda il y a 9 ans
Parent
commit
4f59379d60
3 fichiers modifiés avec 9 ajouts et 12 suppressions
  1. 1 1
      core/mac/inc/sir_api.h
  2. 6 9
      core/sme/src/csr/csr_tdls_process.c
  3. 2 2
      core/wma/src/wma_features.c

+ 1 - 1
core/mac/inc/sir_api.h

@@ -3453,7 +3453,7 @@ typedef struct sSirMgmtTxCompletionInd {
 
 typedef struct sSirTdlsEventnotify {
 	uint8_t sessionId;
-	tSirMacAddr peerMac;
+	struct cdf_mac_addr peermac;
 	uint16_t messageType;
 	uint32_t peer_reason;
 } tSirTdlsEventnotify;

+ 6 - 9
core/sme/src/csr/csr_tdls_process.c

@@ -770,39 +770,36 @@ CDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType,
 		csr_tdls_remove_sme_cmd(pMac, eSmeCommandTdlsLinkEstablish);
 		break;
 	case eWNI_SME_TDLS_SHOULD_DISCOVER:
-		cdf_mem_copy(&roamInfo.peerMac, tevent->peerMac,
-				sizeof(tSirMacAddr));
+		cdf_copy_macaddr(&roamInfo.peerMac, &tevent->peermac);
 		roamInfo.reasonCode = tevent->peer_reason;
 		CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
 				"%s: eWNI_SME_TDLS_SHOULD_DISCOVER for peer mac: "
 				MAC_ADDRESS_STR " peer_reason: %d",
-				__func__, MAC_ADDR_ARRAY(tevent->peerMac),
+				__func__, MAC_ADDR_ARRAY(tevent->peermac.bytes),
 				tevent->peer_reason);
 		csr_roam_call_callback(pMac, tevent->sessionId, &roamInfo,
 				0, eCSR_ROAM_TDLS_STATUS_UPDATE,
 				eCSR_ROAM_RESULT_TDLS_SHOULD_DISCOVER);
 		break;
 	case eWNI_SME_TDLS_SHOULD_TEARDOWN:
-		cdf_mem_copy(&roamInfo.peerMac, tevent->peerMac,
-				sizeof(tSirMacAddr));
+		cdf_copy_macaddr(&roamInfo.peerMac, &tevent->peermac);
 		roamInfo.reasonCode = tevent->peer_reason;
 		CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
 				"%s: eWNI_SME_TDLS_SHOULD_TEARDOWN for peer mac: "
 				MAC_ADDRESS_STR " peer_reason: %d",
-				__func__, MAC_ADDR_ARRAY(tevent->peerMac),
+				__func__, MAC_ADDR_ARRAY(tevent->peermac.bytes),
 				tevent->peer_reason);
 		csr_roam_call_callback(pMac, tevent->sessionId, &roamInfo,
 				0, eCSR_ROAM_TDLS_STATUS_UPDATE,
 				eCSR_ROAM_RESULT_TDLS_SHOULD_TEARDOWN);
 		break;
 	case eWNI_SME_TDLS_PEER_DISCONNECTED:
-		cdf_mem_copy(&roamInfo.peerMac, tevent->peerMac,
-				sizeof(tSirMacAddr));
+		cdf_copy_macaddr(&roamInfo.peerMac, &tevent->peermac);
 		roamInfo.reasonCode = tevent->peer_reason;
 		CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
 				"%s: eWNI_SME_TDLS_PEER_DISCONNECTED for peer mac: "
 				MAC_ADDRESS_STR " peer_reason: %d",
-				__func__, MAC_ADDR_ARRAY(tevent->peerMac),
+				__func__, MAC_ADDR_ARRAY(tevent->peermac.bytes),
 				tevent->peer_reason);
 		csr_roam_call_callback(pMac, tevent->sessionId, &roamInfo,
 				0, eCSR_ROAM_TDLS_STATUS_UPDATE,

+ 2 - 2
core/wma/src/wma_features.c

@@ -6319,7 +6319,7 @@ int wma_tdls_event_handler(void *handle, uint8_t *event, uint32_t len)
 
 	tdls_event->sessionId = peer_event->vdev_id;
 	WMI_MAC_ADDR_TO_CHAR_ARRAY(&peer_event->peer_macaddr,
-				   tdls_event->peerMac);
+				   tdls_event->peermac.bytes);
 
 	switch (peer_event->peer_status) {
 	case WMI_TDLS_SHOULD_DISCOVER:
@@ -6369,7 +6369,7 @@ int wma_tdls_event_handler(void *handle, uint8_t *event, uint32_t len)
 
 	WMA_LOGD("%s: sending msg to umac, messageType: 0x%x, "
 		 "for peer: %pM, reason: %d, smesessionId: %d",
-		 __func__, tdls_event->messageType, tdls_event->peerMac,
+		 __func__, tdls_event->messageType, tdls_event->peermac.bytes,
 		 tdls_event->peer_reason, tdls_event->sessionId);
 
 	wma_send_msg(wma, tdls_event->messageType, (void *)tdls_event, 0);