samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSirSmeDisassocRsp

Browse Source 
Replace tSirMacAddr with cdf_mac_addr in tSirSmeDisassocRsp.

Change-Id: Ia196615e99506b4fa80a7d611cdefd2e7d2150fa
CRs-Fixed: 898864
This commit is contained in:
Srinivas Girigowda
2016-01-05 19:41:27 -08:00
committed by Akash Patel
parent 70a196142e
commit f06a5cf8c8
7 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/mac/inc/sir_api.h
View File

@@ -1377,7 +1377,7 @@ typedef struct sSirSmeDisassocRsp {
uint8_t sessionId; /* Session ID */ uint8_t sessionId; /* Session ID */
uint16_t transactionId; /* Transaction ID for cmd */ uint16_t transactionId; /* Transaction ID for cmd */
tSirResultCodes statusCode; tSirResultCodes statusCode;
tSirMacAddr peerMacAddr; struct cdf_mac_addr peer_macaddr;
tAniStaStatStruct perStaStats; /* STA stats */ tAniStaStatStruct perStaStats; /* STA stats */
uint16_t staId; uint16_t staId;
} cdf_packed tSirSmeDisassocRsp, *tpSirSmeDisassocRsp; } cdf_packed tSirSmeDisassocRsp, *tpSirSmeDisassocRsp;

18
core/mac/src/pe/lim/lim_process_auth_frame.c
View File

@@ -507,17 +507,15 @@ lim_process_auth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
if (pMlmDisassocReq if (pMlmDisassocReq
&& &&
(cdf_mem_compare (cdf_mem_compare
((uint8_t *) pHdr->sa, ((uint8_t *) pHdr->sa,
(uint8_t *) &pMlmDisassocReq->peerMacAddr, &pMlmDisassocReq->peer_macaddr.bytes,
sizeof(tSirMacAddr)))) { CDF_MAC_ADDR_SIZE))) {
PELOGE(lim_log PELOGE(lim_log
(pMac, LOGE, (pMac, LOGE,
FL("TODO:Ack for disassoc " FL("TODO:Ack for disassoc frame is pending Issue delsta for "
"frame is pending Issue delsta for " MAC_ADDRESS_STR),
MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pMlmDisassocReq->
MAC_ADDR_ARRAY(pMlmDisassocReq-> peer_macaddr.bytes));)
peerMacAddr));
)
lim_process_disassoc_ack_timeout(pMac); lim_process_disassoc_ack_timeout(pMac);
isConnected = eSIR_FALSE; isConnected = eSIR_FALSE;
} }

41
core/mac/src/pe/lim/lim_process_mlm_req_messages.c
View File

@@ -1584,7 +1584,7 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx,
CDF_STATUS suspend_status, uint32_t *msg) CDF_STATUS suspend_status, uint32_t *msg)
{ {
uint16_t aid; uint16_t aid;
tSirMacAddr curr_bssid; struct cdf_mac_addr curr_bssid;
tpDphHashNode stads; tpDphHashNode stads;
tLimMlmDisassocReq *mlm_disassocreq; tLimMlmDisassocReq *mlm_disassocreq;
tLimMlmDisassocCnf mlm_disassoccnf; tLimMlmDisassocCnf mlm_disassoccnf;
@@ -1614,19 +1614,19 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx,
"mlmstate %d from: " MAC_ADDRESS_STR), "mlmstate %d from: " MAC_ADDRESS_STR),
mlm_disassocreq->sessionId, GET_LIM_SYSTEM_ROLE(session), mlm_disassocreq->sessionId, GET_LIM_SYSTEM_ROLE(session),
session->limMlmState, session->limMlmState,
MAC_ADDR_ARRAY(mlm_disassocreq->peerMacAddr)); MAC_ADDR_ARRAY(mlm_disassocreq->peer_macaddr.bytes));
sir_copy_mac_addr(curr_bssid, session->bssId); cdf_mem_copy(curr_bssid.bytes, session->bssId, CDF_MAC_ADDR_SIZE);
switch (GET_LIM_SYSTEM_ROLE(session)) { switch (GET_LIM_SYSTEM_ROLE(session)) {
case eLIM_STA_ROLE: case eLIM_STA_ROLE:
case eLIM_BT_AMP_STA_ROLE: case eLIM_BT_AMP_STA_ROLE:
if (!cdf_mem_compare(mlm_disassocreq->peerMacAddr, if (!cdf_is_macaddr_equal(&mlm_disassocreq->peer_macaddr,
curr_bssid, sizeof(tSirMacAddr))) { &curr_bssid)) {
lim_log(mac_ctx, LOGW, lim_log(mac_ctx, LOGW,
FL("received MLM_DISASSOC_REQ with invalid BSS id")); FL("received MLM_DISASSOC_REQ with invalid BSS id"));
lim_print_mac_addr(mac_ctx, lim_print_mac_addr(mac_ctx,
mlm_disassocreq->peerMacAddr, LOGW); mlm_disassocreq->peer_macaddr.bytes, LOGW);
/* /*
* Disassociation response due to host triggered * Disassociation response due to host triggered
@@ -1643,7 +1643,8 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx,
lim_log(mac_ctx, LOG1, lim_log(mac_ctx, LOG1,
FL("send disassoc rsp with ret code %d for" MAC_ADDRESS_STR), FL("send disassoc rsp with ret code %d for" MAC_ADDRESS_STR),
eSIR_SME_DEAUTH_STATUS, eSIR_SME_DEAUTH_STATUS,
MAC_ADDR_ARRAY(mlm_disassocreq->peerMacAddr)); MAC_ADDR_ARRAY(
mlm_disassocreq->peer_macaddr.bytes));
sme_disassoc_rsp->messageType = eWNI_SME_DISASSOC_RSP; sme_disassoc_rsp->messageType = eWNI_SME_DISASSOC_RSP;
sme_disassoc_rsp->length = sizeof(tSirSmeDisassocRsp); sme_disassoc_rsp->length = sizeof(tSirSmeDisassocRsp);
@@ -1652,9 +1653,8 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx,
sme_disassoc_rsp->transactionId = 0; sme_disassoc_rsp->transactionId = 0;
sme_disassoc_rsp->statusCode = eSIR_SME_DEAUTH_STATUS; sme_disassoc_rsp->statusCode = eSIR_SME_DEAUTH_STATUS;
cdf_mem_copy(sme_disassoc_rsp->peerMacAddr, cdf_copy_macaddr(&sme_disassoc_rsp->peer_macaddr,
mlm_disassocreq->peerMacAddr, &mlm_disassocreq->peer_macaddr);
sizeof(tSirMacAddr));
msg = (uint32_t *)sme_disassoc_rsp; msg = (uint32_t *)sme_disassoc_rsp;
lim_send_sme_disassoc_deauth_ntf(mac_ctx, lim_send_sme_disassoc_deauth_ntf(mac_ctx,
@@ -1683,7 +1683,8 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx,
* Check if there exists a context for the peer entity * Check if there exists a context for the peer entity
* to be disassociated with. * to be disassociated with.
*/ */
stads = dph_lookup_hash_entry(mac_ctx, mlm_disassocreq->peerMacAddr, stads = dph_lookup_hash_entry(mac_ctx,
mlm_disassocreq->peer_macaddr.bytes,
&aid, &session->dph.dphHashTable); &aid, &session->dph.dphHashTable);
if (stads) if (stads)
mlm_state = stads->mlmStaContext.mlmState; mlm_state = stads->mlmStaContext.mlmState;
@@ -1699,7 +1700,7 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx,
*/ */
lim_log(mac_ctx, LOGW, lim_log(mac_ctx, LOGW,
FL("Invalid MLM_DISASSOC_REQ, Addr= " MAC_ADDRESS_STR), FL("Invalid MLM_DISASSOC_REQ, Addr= " MAC_ADDRESS_STR),
MAC_ADDR_ARRAY(mlm_disassocreq->peerMacAddr)); MAC_ADDR_ARRAY(mlm_disassocreq->peer_macaddr.bytes));
if (stads != NULL) if (stads != NULL)
lim_log(mac_ctx, LOGE, FL("Sta MlmState : %d"), lim_log(mac_ctx, LOGE, FL("Sta MlmState : %d"),
stads->mlmStaContext.mlmState); stads->mlmStaContext.mlmState);
@@ -1735,7 +1736,7 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx,
lim_send_disassoc_mgmt_frame(mac_ctx, lim_send_disassoc_mgmt_frame(mac_ctx,
mlm_disassocreq->reasonCode, mlm_disassocreq->reasonCode,
mlm_disassocreq->peerMacAddr, session, true); mlm_disassocreq->peer_macaddr.bytes, session, true);
/* /*
* Abort Tx so that data frames won't be sent to the AP * Abort Tx so that data frames won't be sent to the AP
* after sending Disassoc. * after sending Disassoc.
@@ -1760,8 +1761,8 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx,
end: end:
cdf_mem_copy((uint8_t *) &mlm_disassoccnf.peerMacAddr, cdf_mem_copy((uint8_t *) &mlm_disassoccnf.peerMacAddr,
(uint8_t *) mlm_disassocreq->peerMacAddr, (uint8_t *) mlm_disassocreq->peer_macaddr.bytes,
sizeof(tSirMacAddr)); CDF_MAC_ADDR_SIZE);
mlm_disassoccnf.aid = mlm_disassocreq->aid; mlm_disassoccnf.aid = mlm_disassocreq->aid;
mlm_disassoccnf.disassocTrigger = mlm_disassocreq->disassocTrigger; mlm_disassoccnf.disassocTrigger = mlm_disassocreq->disassocTrigger;
@@ -1795,8 +1796,8 @@ bool lim_check_disassoc_deauth_ack_pending(tpAniSirGlobal mac_ctx,
disassoc_req = mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDisassocReq; disassoc_req = mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDisassocReq;
deauth_req = mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDeauthReq; deauth_req = mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDeauthReq;
if ((disassoc_req && (cdf_mem_compare((uint8_t *) sta_mac, if ((disassoc_req && (cdf_mem_compare((uint8_t *) sta_mac,
(uint8_t *) &disassoc_req->peerMacAddr, (uint8_t *) &disassoc_req->peer_macaddr.bytes,
sizeof(tSirMacAddr)))) || CDF_MAC_ADDR_SIZE))) ||
(deauth_req && (cdf_mem_compare((uint8_t *) sta_mac, (deauth_req && (cdf_mem_compare((uint8_t *) sta_mac,
(uint8_t *) &deauth_req->peer_macaddr.bytes, (uint8_t *) &deauth_req->peer_macaddr.bytes,
CDF_MAC_ADDR_SIZE)))) { CDF_MAC_ADDR_SIZE)))) {
@@ -1829,8 +1830,8 @@ void lim_clean_up_disassoc_deauth_req(tpAniSirGlobal mac_ctx,
mlm_disassoc_req = mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDisassocReq; mlm_disassoc_req = mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDisassocReq;
if (mlm_disassoc_req && if (mlm_disassoc_req &&
(cdf_mem_compare((uint8_t *) sta_mac, (cdf_mem_compare((uint8_t *) sta_mac,
(uint8_t *) &mlm_disassoc_req->peerMacAddr, (uint8_t *) &mlm_disassoc_req->peer_macaddr.bytes,
sizeof(tSirMacAddr)))) { CDF_MAC_ADDR_SIZE))) {
if (clean_rx_path) { if (clean_rx_path) {
lim_process_disassoc_ack_timeout(mac_ctx); lim_process_disassoc_ack_timeout(mac_ctx);
} else { } else {
@@ -1907,7 +1908,7 @@ lim_process_mlm_disassoc_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
lim_log(mac_ctx, LOG1, lim_log(mac_ctx, LOG1,
FL("Process disassoc req, sessionID %d from: "MAC_ADDRESS_STR), FL("Process disassoc req, sessionID %d from: "MAC_ADDRESS_STR),
mlm_disassoc_req->sessionId, mlm_disassoc_req->sessionId,
MAC_ADDR_ARRAY(mlm_disassoc_req->peerMacAddr)); MAC_ADDR_ARRAY(mlm_disassoc_req->peer_macaddr.bytes));
lim_process_mlm_disassoc_req_ntf(mac_ctx, CDF_STATUS_SUCCESS, lim_process_mlm_disassoc_req_ntf(mac_ctx, CDF_STATUS_SUCCESS,
(uint32_t *) msg_buf); (uint32_t *) msg_buf);

2
core/mac/src/pe/lim/lim_process_sme_req_messages.c
View File

@@ -2549,7 +2549,7 @@ static void __lim_process_sme_disassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBu
return; return;
} }
cdf_mem_copy((uint8_t *) &pMlmDisassocReq->peerMacAddr, cdf_mem_copy((uint8_t *) &pMlmDisassocReq->peer_macaddr,
(uint8_t *) &smeDisassocReq.peerMacAddr, (uint8_t *) &smeDisassocReq.peerMacAddr,
sizeof(tSirMacAddr)); sizeof(tSirMacAddr));

6
core/mac/src/pe/lim/lim_send_management_frames.c
View File

@@ -3186,7 +3186,7 @@ CDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx)
} }
sta_ds = dph_lookup_hash_entry(mac_ctx, sta_ds = dph_lookup_hash_entry(mac_ctx,
disassoc_req->peerMacAddr, &aid, disassoc_req->peer_macaddr.bytes, &aid,
&pe_session->dph.dphHashTable); &pe_session->dph.dphHashTable);
if (sta_ds == NULL) { if (sta_ds == NULL) {
lim_log(mac_ctx, LOGE, FL("StaDs Null")); lim_log(mac_ctx, LOGE, FL("StaDs Null"));
@@ -3250,8 +3250,8 @@ CDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx)
} }
end: end:
cdf_mem_copy((uint8_t *) &disassoc_cnf.peerMacAddr, cdf_mem_copy((uint8_t *) &disassoc_cnf.peerMacAddr,
(uint8_t *) disassoc_req->peerMacAddr, (uint8_t *) disassoc_req->peer_macaddr.bytes,
sizeof(tSirMacAddr)); CDF_MAC_ADDR_SIZE);
disassoc_cnf.aid = disassoc_req->aid; disassoc_cnf.aid = disassoc_req->aid;
disassoc_cnf.disassocTrigger = disassoc_req->disassocTrigger; disassoc_cnf.disassocTrigger = disassoc_req->disassocTrigger;

4
core/mac/src/pe/lim/lim_types.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
* *
* Previously licensed under the ISC license by Qualcomm Atheros, Inc. * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
* *
@@ -333,7 +333,7 @@ typedef struct sLimMlmDeauthInd {
} tLimMlmDeauthInd, *tpLimMlmDeauthInd; } tLimMlmDeauthInd, *tpLimMlmDeauthInd;
typedef struct sLimMlmDisassocReq { typedef struct sLimMlmDisassocReq {
tSirMacAddr peerMacAddr; struct cdf_mac_addr peer_macaddr;
uint16_t reasonCode; uint16_t reasonCode;
uint16_t disassocTrigger; uint16_t disassocTrigger;
uint16_t aid; uint16_t aid;

7
core/sme/src/csr/csr_api_roam.c
View File

@@ -10335,9 +10335,8 @@ csr_roam_chk_lnk_disassoc_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr)
if (CSR_IS_INFRA_AP(&session->connectedProfile)) { if (CSR_IS_INFRA_AP(&session->connectedProfile)) {
roam_info_ptr = &roam_info; roam_info_ptr = &roam_info;
roam_info_ptr->u.pConnectedProfile = &session->connectedProfile; roam_info_ptr->u.pConnectedProfile = &session->connectedProfile;
cdf_mem_copy(roam_info_ptr->peerMac.bytes, cdf_copy_macaddr(&roam_info_ptr->peerMac,
pDisassocRsp->peerMacAddr, &pDisassocRsp->peer_macaddr);
sizeof(tSirMacAddr));
roam_info_ptr->reasonCode = eCSR_ROAM_RESULT_FORCED; roam_info_ptr->reasonCode = eCSR_ROAM_RESULT_FORCED;
roam_info_ptr->statusCode = pDisassocRsp->statusCode; roam_info_ptr->statusCode = pDisassocRsp->statusCode;
status = csr_roam_call_callback(mac_ctx, sessionId, status = csr_roam_call_callback(mac_ctx, sessionId,
@@ -17885,7 +17884,7 @@ static void csr_ser_des_unpack_diassoc_rsp(uint8_t *pBuf, tSirSmeDisassocRsp *pR
pBuf += 2; pBuf += 2;
cdf_get_u32(pBuf, (uint32_t *) &pRsp->statusCode); cdf_get_u32(pBuf, (uint32_t *) &pRsp->statusCode);
pBuf += 4; pBuf += 4;
cdf_mem_copy(pRsp->peerMacAddr, pBuf, 6); cdf_mem_copy(pRsp->peer_macaddr.bytes, pBuf, CDF_MAC_ADDR_SIZE);
} }
} }