Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7907a240 authored by Srinivas Girigowda's avatar Srinivas Girigowda Committed by Akash Patel
Browse files

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
parent f06a5cf8

core/mac/inc/sir_api.h

+2 −2
Original line number Diff line number Diff line
@@ -1241,8 +1241,8 @@ typedef struct sSirSmeDisassocReq { 
	uint16_t length;

	uint8_t sessionId;      /* Session ID */

	uint16_t transactionId; /* Transaction ID for cmd */

	tSirMacAddr bssId;      /* Peer BSSID */

	tSirMacAddr peerMacAddr;

	struct cdf_mac_addr bssid;      /* Peer BSSID */

	struct cdf_mac_addr peer_macaddr;

	uint16_t reasonCode;

	/* This flag tells LIM whether to send the disassoc OTA or not */

	/* This will be set in while handing off from one AP to other */

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

+11 −11
Original line number Diff line number Diff line
@@ -2396,13 +2396,13 @@ static void __lim_process_sme_disassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBu 
	}



	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 @@ static void __lim_process_sme_disassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBu 
			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 @@ static void __lim_process_sme_disassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBu 
		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 @@ static void __lim_process_sme_disassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBu 


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() ***/

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

+2 −2
Original line number Diff line number Diff line
@@ -585,8 +585,8 @@ lim_is_sme_disassoc_req_valid(tpAniSirGlobal pMac, 
			      tpSirSmeDisassocReq pDisassocReq,

			      tpPESession psessionEntry)

{

	if (lim_is_group_addr(pDisassocReq->peerMacAddr) &&

	    !lim_is_addr_bc(pDisassocReq->peerMacAddr))

	if (cdf_is_macaddr_group(&pDisassocReq->peer_macaddr) &&

	    !cdf_is_macaddr_broadcast(&pDisassocReq->peer_macaddr))

		return false;



	return true;

core/sme/src/csr/csr_api_roam.c

+8 −10
Original line number Diff line number Diff line
@@ -14052,19 +14052,17 @@ CDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, 
	pMsg->transactionId = 0;

	if ((pSession->pCurRoamProfile != NULL)

		&& (CSR_IS_INFRA_AP(pSession->pCurRoamProfile))) {

		cdf_mem_copy(&pMsg->bssId,

		cdf_mem_copy(&pMsg->bssid.bytes,

			     &pSession->selfMacAddr,

			     sizeof(tSirMacAddr));

		cdf_mem_copy(&pMsg->peerMacAddr,

			     CDF_MAC_ADDR_SIZE);

		cdf_mem_copy(&pMsg->peer_macaddr.bytes,

			     bssId,

			     sizeof(tSirMacAddr));

			     CDF_MAC_ADDR_SIZE);

	} else {

		cdf_mem_copy(&pMsg->bssId,

			     bssId,

			     sizeof(tSirMacAddr));

		cdf_mem_copy(&pMsg->peerMacAddr,

			     bssId,

			     sizeof(tSirMacAddr));

		cdf_mem_copy(&pMsg->bssid.bytes,

			     bssId, CDF_MAC_ADDR_SIZE);

		cdf_mem_copy(&pMsg->peer_macaddr.bytes,

			     bssId, CDF_MAC_ADDR_SIZE);

	}

	pMsg->reasonCode = reasonCode;

	/*