qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSirSmeAssocCnf

Replace tSirMacAddr with cdf_mac_addr in tSirSmeAssocCnf.

Change-Id: I0b267ad09aac1f44079477cfde8d13265c1f2264
CRs-Fixed: 898864

core/mac/inc/sir_api.h

@@ -1150,10 +1150,10 @@ typedef struct sSirSmeAssocCnf {
 	uint16_t messageType;   /* eWNI_SME_ASSOC_CNF */
 	uint16_t length;
 	tSirResultCodes statusCode;
-	tSirMacAddr bssId;      /* Self BSSID */
-	tSirMacAddr peerMacAddr;
+	struct cdf_mac_addr bssid;      /* Self BSSID */
+	struct cdf_mac_addr peer_macaddr;
 	uint16_t aid;
-	tSirMacAddr alternateBssId;
+	struct cdf_mac_addr alternate_bssid;
 	uint8_t alternateChannelId;
 } tSirSmeAssocCnf, *tpSirSmeAssocCnf;
 

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

@@ -358,7 +358,7 @@ __lim_fresh_scan_reqd(tpAniSirGlobal mac_ctx, uint8_t return_fresh_results)
 
 static inline uint8_t __lim_is_sme_assoc_cnf_valid(tpSirSmeAssocCnf pAssocCnf)
 {
-	if (lim_is_group_addr(pAssocCnf->peerMacAddr))
+	if (cdf_is_macaddr_group(&pAssocCnf->peer_macaddr))
 		return false;
 	else
 		return true;
@@ -3526,7 +3526,7 @@ void __lim_process_sme_assoc_cnf_new(tpAniSirGlobal mac_ctx, uint32_t msg_type,
 		goto end;
 	}
 
-	session_entry = pe_find_session_by_bssid(mac_ctx, assoc_cnf.bssId,
+	session_entry = pe_find_session_by_bssid(mac_ctx, assoc_cnf.bssid.bytes,
 			&session_id);
 	if (session_entry == NULL) {
 		lim_log(mac_ctx, LOGE,
@@ -3551,13 +3551,13 @@ void __lim_process_sme_assoc_cnf_new(tpAniSirGlobal mac_ctx, uint32_t msg_type,
 		lim_log(mac_ctx, LOGE, FL(
 			"Rcvd invalid msg %X due to no STA ctx, aid %d, peer "),
 				msg_type, assoc_cnf.aid);
-		lim_print_mac_addr(mac_ctx, assoc_cnf.peerMacAddr, LOG1);
+		lim_print_mac_addr(mac_ctx, assoc_cnf.peer_macaddr.bytes, LOG1);
 
 		/*
 		 * send a DISASSOC_IND message to WSM to make sure
 		 * the state in WSM and LIM is the same
 		 */
-		lim_send_sme_disassoc_ntf(mac_ctx, assoc_cnf.peerMacAddr,
+		lim_send_sme_disassoc_ntf(mac_ctx, assoc_cnf.peer_macaddr.bytes,
 				eSIR_SME_STA_NOT_ASSOCIATED,
 				eLIM_PEER_ENTITY_DISASSOC, assoc_cnf.aid,
 				session_entry->smeSessionId,
@@ -3566,12 +3566,12 @@ void __lim_process_sme_assoc_cnf_new(tpAniSirGlobal mac_ctx, uint32_t msg_type,
 		goto end;
 	}
 	if (!cdf_mem_compare((uint8_t *)sta_ds->staAddr,
-				(uint8_t *) assoc_cnf.peerMacAddr,
-				sizeof(tSirMacAddr))) {
+				(uint8_t *) assoc_cnf.peer_macaddr.bytes,
+				CDF_MAC_ADDR_SIZE)) {
 		lim_log(mac_ctx, LOG1, FL(
 				"peerMacAddr mismatched for aid %d, peer "),
 				assoc_cnf.aid);
-		lim_print_mac_addr(mac_ctx, assoc_cnf.peerMacAddr, LOG1);
+		lim_print_mac_addr(mac_ctx, assoc_cnf.peer_macaddr.bytes, LOG1);
 		goto end;
 	}
 
@@ -3584,7 +3584,7 @@ void __lim_process_sme_assoc_cnf_new(tpAniSirGlobal mac_ctx, uint32_t msg_type,
 			"not in MLM_WT_ASSOC_CNF_STATE, for aid %d, peer"
 			"StaD mlmState : %d"),
 			assoc_cnf.aid, sta_ds->mlmStaContext.mlmState);
-		lim_print_mac_addr(mac_ctx, assoc_cnf.peerMacAddr, LOG1);
+		lim_print_mac_addr(mac_ctx, assoc_cnf.peer_macaddr.bytes, LOG1);
 		goto end;
 	}
 	/*

core/sme/src/csr/csr_api_roam.c

@@ -14355,16 +14355,16 @@ CDF_STATUS csr_send_assoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocIn
 		else
 			pMsg->statusCode = eSIR_SME_ASSOC_REFUSED;
 		/* bssId */
-		cdf_mem_copy(pMsg->bssId, pAssocInd->bssId,
-			     sizeof(tSirMacAddr));
+		cdf_mem_copy(pMsg->bssid.bytes, pAssocInd->bssId,
+			     CDF_MAC_ADDR_SIZE);
 		/* peerMacAddr */
-		cdf_mem_copy(pMsg->peerMacAddr, pAssocInd->peerMacAddr,
-			     sizeof(tSirMacAddr));
+		cdf_mem_copy(pMsg->peer_macaddr.bytes, pAssocInd->peerMacAddr,
+			     CDF_MAC_ADDR_SIZE);
 		/* aid */
 		pMsg->aid = pAssocInd->aid;
 		/* alternateBssId */
-		cdf_mem_copy(pMsg->alternateBssId, pAssocInd->bssId,
-			     sizeof(tSirMacAddr));
+		cdf_mem_copy(pMsg->alternate_bssid.bytes, pAssocInd->bssId,
+			     CDF_MAC_ADDR_SIZE);
 		/* alternateChannelId */
 		pMsg->alternateChannelId = 11;
 		/* pMsg is freed by cds_send_mb_message_to_mac in anycase*/