A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 13:49:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSirFTUpdateKeyInfo

Browse source 
Replace tSirMacAddr with cdf_mac_addr in struct sSirFTUpdateKeyInfo.

Change-Id: I427217dfb4f08dde6bef874de6d68ca5281502e0
CRs-Fixed: 898864
This commit is contained in:
Srinivas Girigowda 2015-12-04 13:53:58 -08:00 • committed by Akash Patel
commit f9d9dd47ab
3 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/mac/src/pe/include/lim_ft_defs.h
View file

@ -89,7 +89,7 @@ typedef struct sSirFTUpdateKeyInfo {
uint16_t messageType;
uint16_t length;
uint32_t smeSessionId;
tSirMacAddr bssId;
struct cdf_mac_addr bssid;
tSirKeyMaterial keyMaterial;
} tSirFTUpdateKeyInfo, *tpSirFTUpdateKeyInfo;

16
core/mac/src/pe/lim/lim_ft.c
View file

@ -1608,13 +1608,14 @@ bool lim_process_ft_update_key(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
pKeyInfo = (tSirFTUpdateKeyInfo *) pMsgBuf;
psessionEntry = pe_find_session_by_bssid(pMac, pKeyInfo->bssId, &sessionId);
psessionEntry = pe_find_session_by_bssid(pMac, pKeyInfo->bssid.bytes,
&sessionId);
if (NULL == psessionEntry) {
PELOGE(lim_log(pMac, LOGE,
"%s: Unable to find session for the following bssid",
__func__);
)
lim_print_mac_addr(pMac, pKeyInfo->bssId, LOGE);
lim_print_mac_addr(pMac, pKeyInfo->bssid.bytes, LOGE);
return false;
}
@ -1635,8 +1636,8 @@ bool lim_process_ft_update_key(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
extSetStaKeyParam;
cdf_mem_zero(pMlmSetKeysReq, sizeof(tLimMlmSetKeysReq));
cdf_mem_copy(pMlmSetKeysReq->peer_macaddr.bytes,
pKeyInfo->bssId, CDF_MAC_ADDR_SIZE);
cdf_copy_macaddr(&pMlmSetKeysReq->peer_macaddr,
&pKeyInfo->bssid);
pMlmSetKeysReq->sessionId = psessionEntry->peSessionId;
pMlmSetKeysReq->smesessionId = psessionEntry->smeSessionId;
pMlmSetKeysReq->edType = pKeyInfo->keyMaterial.edType;
@ -1684,11 +1685,10 @@ bool lim_process_ft_update_key(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
PELOG1(lim_log(pMac, LOG1,
FL("BSSID = " MAC_ADDRESS_STR),
MAC_ADDR_ARRAY(pKeyInfo->bssId));
)
MAC_ADDR_ARRAY(pKeyInfo->bssid.bytes));)
sir_copy_mac_addr(pAddBssParams->extSetStaKeyParam.peer_macaddr.bytes,
pKeyInfo->bssId);
cdf_copy_macaddr(&pAddBssParams->extSetStaKeyParam.peer_macaddr,
&pKeyInfo->bssid);
pAddBssParams->extSetStaKeyParam.sendRsp = false;

5
core/sme/src/common/sme_ft_api.c
View file

@ -351,11 +351,10 @@ CDF_STATUS sme_ft_send_update_key_ind(tHalHandle hal, uint32_t session_id,
}
}
cdf_mem_copy(&msg->bssId[0],
&ftkey_info->peerMac.bytes[0], CDF_MAC_ADDR_SIZE);
cdf_copy_macaddr(&msg->bssid, &ftkey_info->peerMac);
msg->smeSessionId = session_id;
sms_log(mac_ctx, LOG1, "BSSID = " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(msg->bssId));
MAC_ADDR_ARRAY(msg->bssid.bytes));
status = cds_send_mb_message_to_mac(msg);
return status;