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 sLimMlmOemDataReq

Browse Source 
Replace tSirMacAddr with cdf_mac_addr in sLimMlmOemDataReq.

Change-Id: I4589769f9d875347a4a5c10cd755c931b98fa8f7
CRs-Fixed: 898864
This commit is contained in:
Srinivas Girigowda
2015-09-24 14:03:29 -07:00
committed by Satish Singh
parent 62b92ecbda
commit a85d8ddcf9
6 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -871,7 +871,7 @@ typedef struct sSirSmeScanChanReq {
typedef struct sSirOemDataReq {
uint16_t messageType; /* eWNI_SME_OEM_DATA_REQ */
uint16_t messageLen;
tSirMacAddr selfMacAddr;
struct cdf_mac_addr selfMacAddr;
uint8_t oemDataReq[OEM_DATA_REQ_SIZE];
} tSirOemDataReq, *tpSirOemDataReq;

2
core/mac/src/pe/include/lim_global.h
View File

@@ -306,7 +306,7 @@ struct tLimScanResultNode {
/* OEM Data related structure definitions */
typedef struct sLimMlmOemDataReq {
tSirMacAddr selfMacAddr;
struct cdf_mac_addr selfMacAddr;
uint8_t oemDataReq[OEM_DATA_REQ_SIZE];
} tLimMlmOemDataReq, *tpLimMlmOemDataReq;

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

@@ -386,9 +386,8 @@ void lim_send_hal_oem_data_req(tpAniSirGlobal mac_ctx)
cdf_mem_set((uint8_t *) (start_oem_data_req), reqlen, 0);
/* Now copy over the information to the OEM DATA REQ to HAL */
cdf_mem_copy(start_oem_data_req->selfMacAddr,
mac_ctx->lim.gpLimMlmOemDataReq->selfMacAddr,
sizeof(tSirMacAddr));
cdf_copy_macaddr(&start_oem_data_req->selfMacAddr,
&mac_ctx->lim.gpLimMlmOemDataReq->selfMacAddr);
cdf_mem_copy(start_oem_data_req->oemDataReq,
mac_ctx->lim.gpLimMlmOemDataReq->oemDataReq,

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

@@ -1503,8 +1503,8 @@ static void __lim_process_sme_oem_data_req(tpAniSirGlobal pMac, uint32_t *pMsgBu
/* Initialize this buffer */
cdf_mem_set(pMlmOemDataReq, (sizeof(tLimMlmOemDataReq)), 0);
cdf_mem_copy(pMlmOemDataReq->selfMacAddr, pOemDataReq->selfMacAddr,
sizeof(tSirMacAddr));
cdf_copy_macaddr(&pMlmOemDataReq->selfMacAddr,
&pOemDataReq->selfMacAddr);
cdf_mem_copy(pMlmOemDataReq->oemDataReq, pOemDataReq->oemDataReq,
OEM_DATA_REQ_SIZE);

4
core/sme/src/oem_data/oem_data_api.c
View File

@@ -38,6 +38,7 @@
#include "cds_mq.h"
#include "sme_inside.h"
#include "sms_debug.h"
#include "cdf_util.h"
#include "csr_support.h"
@@ -222,8 +223,7 @@ CDF_STATUS oem_data_send_mb_oem_data_req(tpAniSirGlobal pMac,
cdf_mem_set(pMsg, msgLen, 0);
pMsg->messageType = eWNI_SME_OEM_DATA_REQ;
pMsg->messageLen = msgLen;
cdf_mem_copy(pMsg->selfMacAddr, pSession->selfMacAddr.bytes,
sizeof(tSirMacAddr));
cdf_copy_macaddr(&pMsg->selfMacAddr, &pSession->selfMacAddr);
cdf_mem_copy(pMsg->oemDataReq, pOemDataReq->oemDataReq,
OEM_DATA_REQ_SIZE);
sms_log(pMac, LOGW, "OEM_DATA: sending message to pe%s", __func__);

2
core/wma/inc/wma_if.h
View File

@@ -674,7 +674,7 @@ typedef struct {
* @oemDataReq: OEM Data request
*/
typedef struct {
tSirMacAddr selfMacAddr;
struct cdf_mac_addr selfMacAddr;
CDF_STATUS status;
uint8_t oemDataReq[OEM_DATA_REQ_SIZE];
} tStartOemDataReq, *tpStartOemDataReq;