qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSirTdlsAddSta Req/Rsp

Replace tSirMacAddr with cdf_mac_addr in tSirTdlsAddSta Req/Rsp.

Change-Id: Ie10b69ce99645f7ace3d772dc8c8de87ad86f2bc
CRs-Fixed: 898864

core/mac/inc/sir_api.h

@@ -3351,9 +3351,9 @@ typedef struct sSirTdlsAddStaReq {
 	uint8_t sessionId;      /* Session ID */
 	uint16_t transactionId; /* Transaction ID for cmd */
 	/* For multi-session, for PE to locate peSession ID */
-	tSirMacAddr bssid;
+	struct cdf_mac_addr bssid;
 	eTdlsAddOper tdlsAddOper;
-	tSirMacAddr peerMac;
+	struct cdf_mac_addr peermac;
 	uint16_t capability;
 	uint8_t extn_capability[SIR_MAC_MAX_EXTN_CAP];
 	uint8_t supported_rates_length;
@@ -3371,7 +3371,7 @@ typedef struct sSirTdlsAddStaRsp {
 	uint16_t messageType;
 	uint16_t length;
 	tSirResultCodes statusCode;
-	tSirMacAddr peerMac;
+	struct cdf_mac_addr peermac;
 	uint8_t sessionId;      /* Session ID */
 	uint16_t staId;
 	uint16_t staType;

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

@@ -2379,7 +2379,7 @@ static tSirRetStatus lim_tdls_setup_add_sta(tpAniSirGlobal pMac,
 	tSirRetStatus status = eSIR_SUCCESS;
 	uint16_t aid = 0;
 
-	pStaDs = dph_lookup_hash_entry(pMac, pAddStaReq->peerMac, &aid,
+	pStaDs = dph_lookup_hash_entry(pMac, pAddStaReq->peermac.bytes, &aid,
 				       &psessionEntry->dph.dphHashTable);
 	if (NULL == pStaDs) {
 		aid = lim_assign_peer_idx(pMac, psessionEntry);
@@ -2388,7 +2388,7 @@ static tSirRetStatus lim_tdls_setup_add_sta(tpAniSirGlobal pMac,
 			lim_log(pMac, LOGE,
 				FL("No more free AID for peer "
 				   MAC_ADDRESS_STR),
-				MAC_ADDR_ARRAY(pAddStaReq->peerMac));
+				MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes));
 			return eSIR_FAILURE;
 		}
 
@@ -2396,7 +2396,7 @@ static tSirRetStatus lim_tdls_setup_add_sta(tpAniSirGlobal pMac,
 		SET_PEER_AID_BITMAP(psessionEntry->peerAIDBitmap, aid);
 
 		lim_log(pMac, LOG1, FL("Aid = %d, for peer =" MAC_ADDRESS_STR),
-			aid, MAC_ADDR_ARRAY(pAddStaReq->peerMac));
+			aid, MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes));
 		pStaDs =
 			dph_get_hash_entry(pMac, aid,
 					   &psessionEntry->dph.dphHashTable);
@@ -2408,8 +2408,8 @@ static tSirRetStatus lim_tdls_setup_add_sta(tpAniSirGlobal pMac,
 						  psessionEntry);
 		}
 
-		pStaDs = dph_add_hash_entry(pMac, pAddStaReq->peerMac, aid,
-					    &psessionEntry->dph.dphHashTable);
+		pStaDs = dph_add_hash_entry(pMac, pAddStaReq->peermac.bytes,
+					 aid, &psessionEntry->dph.dphHashTable);
 
 		if (NULL == pStaDs) {
 			lim_log(pMac, LOGE, FL("add hash entry failed"));
@@ -2490,8 +2490,8 @@ static CDF_STATUS lim_send_sme_tdls_add_sta_rsp(tpAniSirGlobal pMac,
 		addStaRsp->bcastSig = pStaDs->ucBcastSig;
 	}
 	if (peerMac) {
-		cdf_mem_copy(addStaRsp->peerMac,
-			     (uint8_t *) peerMac, sizeof(tSirMacAddr));
+		cdf_mem_copy(addStaRsp->peermac.bytes,
+			     (uint8_t *) peerMac, CDF_MAC_ADDR_SIZE);
 	}
 	if (updateSta)
 		addStaRsp->tdlsAddOper = TDLS_OPER_UPDATE;
@@ -2506,7 +2506,6 @@ static CDF_STATUS lim_send_sme_tdls_add_sta_rsp(tpAniSirGlobal pMac,
 	lim_sys_process_mmh_msg_api(pMac, &mmhMsg, ePROT);
 
 	return CDF_STATUS_SUCCESS;
-
 }
 
 /*
@@ -2921,7 +2920,8 @@ tSirRetStatus lim_process_sme_tdls_add_sta_req(tpAniSirGlobal pMac,
 
 	lim_log(pMac, LOG1, FL("TDLS Add STA Request Recieved"));
 	psessionEntry =
-		pe_find_session_by_bssid(pMac, pAddStaReq->bssid, &sessionId);
+		pe_find_session_by_bssid(pMac, pAddStaReq->bssid.bytes,
+					 &sessionId);
 	if (psessionEntry == NULL) {
 		lim_log(pMac, LOGE,
 			FL(
@@ -2963,7 +2963,8 @@ tSirRetStatus lim_process_sme_tdls_add_sta_req(tpAniSirGlobal pMac,
 	return eSIR_SUCCESS;
 lim_tdls_add_sta_error:
 	lim_send_sme_tdls_add_sta_rsp(pMac,
-				      pAddStaReq->sessionId, pAddStaReq->peerMac,
+				      pAddStaReq->sessionId,
+				      pAddStaReq->peermac.bytes,
 				      (pAddStaReq->tdlsAddOper == TDLS_OPER_UPDATE),
 				      NULL, eSIR_FAILURE);
 

core/sme/inc/sme_inside.h

@@ -123,7 +123,7 @@ typedef struct TdlsLinkEstablishInfo {
 
 typedef struct TdlsAddStaInfo {
 	eTdlsAddOper tdlsAddOper;
-	tSirMacAddr peerMac;
+	struct cdf_mac_addr peermac;
 	uint16_t capability;
 	uint8_t extnCapability[SIR_MAC_MAX_EXTN_CAP];
 	uint8_t supportedRatesLen;
@@ -137,7 +137,7 @@ typedef struct TdlsAddStaInfo {
 } tTdlsAddStaCmdInfo;
 
 typedef struct TdlsDelStaInfo {
-	tSirMacAddr peerMac;
+	struct cdf_mac_addr peermac;
 } tTdlsDelStaCmdInfo;
 /*
  * TDLS cmd info, CMD from SME to PE.

core/sme/src/csr/csr_tdls_process.c

@@ -158,8 +158,8 @@ CDF_STATUS csr_tdls_change_peer_sta(tHalHandle hHal, uint8_t sessionId,
 
 			tdlsAddStaCmd->sessionId = sessionId;
 
-			cdf_mem_copy(tdlsAddStaCmdInfo->peerMac,
-				     peerMac, sizeof(tSirMacAddr));
+			cdf_mem_copy(tdlsAddStaCmdInfo->peermac.bytes,
+				     peerMac, CDF_MAC_ADDR_SIZE);
 			tdlsAddStaCmdInfo->capability = pstaParams->capability;
 			tdlsAddStaCmdInfo->uapsdQueues =
 				pstaParams->uapsd_queues;
@@ -300,8 +300,8 @@ CDF_STATUS csr_tdls_add_peer_sta(tHalHandle hHal, uint8_t sessionId,
 			tdlsAddStaCmd->sessionId = sessionId;
 			tdlsAddStaCmdInfo->tdlsAddOper = TDLS_OPER_ADD;
 
-			cdf_mem_copy(tdlsAddStaCmdInfo->peerMac,
-				     peerMac, sizeof(tSirMacAddr));
+			cdf_mem_copy(tdlsAddStaCmdInfo->peermac.bytes,
+				     peerMac, CDF_MAC_ADDR_SIZE);
 
 			tdlsAddStaCmd->command = eSmeCommandTdlsAddPeer;
 			tdlsAddStaCmd->u.tdlsCmd.size =
@@ -336,8 +336,8 @@ CDF_STATUS csr_tdls_del_peer_sta(tHalHandle hHal, uint8_t sessionId,
 
 			tdlsDelStaCmd->sessionId = sessionId;
 
-			cdf_mem_copy(tdlsDelStaCmdInfo->peerMac,
-				     peerMac, sizeof(tSirMacAddr));
+			cdf_mem_copy(tdlsDelStaCmdInfo->peermac.bytes,
+				     peerMac, CDF_MAC_ADDR_SIZE);
 
 			tdlsDelStaCmd->command = eSmeCommandTdlsDelPeer;
 			tdlsDelStaCmd->u.tdlsCmd.size =
@@ -475,11 +475,11 @@ CDF_STATUS csr_tdls_process_add_sta(tpAniSirGlobal pMac, tSmeCmd *cmd)
 	/* Using dialog as transactionId. This can be used to match response with request */
 	tdlsAddStaReq->transactionId = 0;
 
-	cdf_mem_copy(tdlsAddStaReq->bssid,
-		     pSession->pConnectBssDesc->bssId, sizeof(tSirMacAddr));
+	cdf_mem_copy(tdlsAddStaReq->bssid.bytes,
+		     pSession->pConnectBssDesc->bssId, CDF_MAC_ADDR_SIZE);
 
-	cdf_mem_copy(tdlsAddStaReq->peerMac,
-		     tdlsAddStaCmdInfo->peerMac, sizeof(tSirMacAddr));
+	cdf_copy_macaddr(&tdlsAddStaReq->peermac,
+			 &tdlsAddStaCmdInfo->peermac);
 
 	tdlsAddStaReq->capability = tdlsAddStaCmdInfo->capability;
 	tdlsAddStaReq->uapsd_queues = tdlsAddStaCmdInfo->uapsdQueues;
@@ -548,13 +548,13 @@ CDF_STATUS csr_tdls_process_del_sta(tpAniSirGlobal pMac, tSmeCmd *cmd)
 	cdf_mem_copy(tdlsDelStaReq->bssid.bytes,
 		     pSession->pConnectBssDesc->bssId, CDF_MAC_ADDR_SIZE);
 
-	cdf_mem_copy(tdlsDelStaReq->peermac.bytes,
-		     tdlsDelStaCmdInfo->peerMac, CDF_MAC_ADDR_SIZE);
+	cdf_copy_macaddr(&tdlsDelStaReq->peermac,
+			 &tdlsDelStaCmdInfo->peermac);
 
 	/* Send the request to PE. */
 	sms_log(pMac, LOG1,
 		"sending TDLS Del Sta " MAC_ADDRESS_STR " req to PE",
-		MAC_ADDR_ARRAY(tdlsDelStaCmdInfo->peerMac));
+		MAC_ADDR_ARRAY(tdlsDelStaCmdInfo->peermac.bytes));
 	status = tdls_send_message(pMac, eWNI_SME_TDLS_DEL_STA_REQ,
 				   (void *)tdlsDelStaReq,
 				   sizeof(tSirTdlsDelStaReq));
@@ -695,8 +695,7 @@ CDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType,
 		csr_tdls_remove_sme_cmd(pMac, eSmeCommandTdlsSendMgmt);
 		break;
 	case eWNI_SME_TDLS_ADD_STA_RSP:
-		cdf_mem_copy(&roamInfo.peerMac, addStaRsp->peerMac,
-				sizeof(tSirMacAddr));
+		cdf_copy_macaddr(&roamInfo.peerMac, &addStaRsp->peermac);
 		roamInfo.staId = addStaRsp->staId;
 		roamInfo.ucastSig = addStaRsp->ucastSig;
 		roamInfo.bcastSig = addStaRsp->bcastSig;