diff options
| author | Mingcheng Zhu <mingchen@qca.qualcomm.com> | 2014-07-16 16:34:05 -0700 |
|---|---|---|
| committer | Akash Patel <c_akashp@qca.qualcomm.com> | 2014-07-18 18:56:46 -0700 |
| commit | 4d1012be4c0f87a99cc440bd247bf9f70f9be2c8 (patch) | |
| tree | 24460b5c185df9c618d1e9a77b4560da9a06d4ad | |
| parent | 5ec4b45574853e6c5b52e31f5dad09ea355211dc (diff) | |
wlan: fix 64 bit compilation error
fix 64 bit compilation error
Change-Id: I986d43ed3c912096e44a5fd8723bf5167c4da40b
CRs-Fixed: 657692
| -rw-r--r-- | CORE/EPPING/inc/epping_internal.h | 2 | ||||
| -rw-r--r-- | CORE/EPPING/src/epping_helper.c | 6 | ||||
| -rw-r--r-- | CORE/EPPING/src/epping_tx.c | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/CORE/EPPING/inc/epping_internal.h b/CORE/EPPING/inc/epping_internal.h index 961f608351fc..043fd09cdfac 100644 --- a/CORE/EPPING/inc/epping_internal.h +++ b/CORE/EPPING/inc/epping_internal.h @@ -57,7 +57,7 @@ #define EPPING_LOG_MASK (1<<EPPING_CMD_CAPTURE_RECV_CNT) #define EPPING_STATS_LOG_COUNT 50000 -#define EPPING_KTID_KILL_WAIT_TIME_US 50000 +#define EPPING_KTID_KILL_WAIT_TIME_MS 50 /*--------------------------------------------------------------------------- Preprocessor definitions and constants -------------------------------------------------------------------------*/ diff --git a/CORE/EPPING/src/epping_helper.c b/CORE/EPPING/src/epping_helper.c index ccee9823695d..193dd3dc6c4f 100644 --- a/CORE/EPPING/src/epping_helper.c +++ b/CORE/EPPING/src/epping_helper.c @@ -77,9 +77,7 @@ int epping_cookie_init(epping_context_t*pEpping_ctx) vos_mem_malloc(sizeof(struct epping_cookie)*MAX_COOKIE_SLOT_SIZE); if (pEpping_ctx->s_cookie_mem == NULL) { EPPING_LOG(VOS_TRACE_LEVEL_FATAL, - "%s: no mem for cookie (idx = %d, size = %d)", - __func__, i, - sizeof(struct epping_cookie)*MAX_COOKIE_SLOT_SIZE); + "%s: no mem for cookie (idx = %d)", __func__, i); goto error; } vos_mem_zero(pEpping_ctx->s_cookie_mem[i], @@ -280,7 +278,7 @@ void epping_unregister_tx_copier(HTC_ENDPOINT_ID eid, epping_context_t *pEpping_ epping_poll->done = true; if (epping_poll->inited) { epping_tx_copier_schedule(pEpping_ctx, eid, NULL); - usleep(EPPING_KTID_KILL_WAIT_TIME_US); + msleep(EPPING_KTID_KILL_WAIT_TIME_MS); } if (epping_poll->skb) adf_nbuf_free(epping_poll->skb); diff --git a/CORE/EPPING/src/epping_tx.c b/CORE/EPPING/src/epping_tx.c index ef74e28405a3..a00a0ae38f43 100644 --- a/CORE/EPPING/src/epping_tx.c +++ b/CORE/EPPING/src/epping_tx.c @@ -355,8 +355,8 @@ void epping_tx_complete_multiple(void *ctx, ASSERT(htc_pkt->ActualLength == adf_nbuf_len(pktSkb)); } EPPING_LOG(VOS_TRACE_LEVEL_INFO, - "%s skb=0x%x data=0x%x len=0x%x eid=%d ", - __func__, (A_UINT32)pktSkb, (A_UINT32)htc_pkt->pBuffer, + "%s skb=%p data=%p len=0x%x eid=%d ", + __func__, pktSkb, htc_pkt->pBuffer, htc_pkt->ActualLength, eid); if (A_FAILED(status)) { |