From fd68172e84dfecb5546036754a19d677a31b824b Mon Sep 17 00:00:00 2001 From: Himanshu Agarwal Date: Thu, 27 Oct 2016 19:07:25 +0530 Subject: [PATCH] qcacld-3.0: Fix improper naming and exporting of dump_frag_desc() Fix improper naming and exporting of dump_frag_desc() by: 1) adding ol_txrx prefix in the api 2) adding prototype of api to ol_tx.h and removing the local prototype for the api from core/dp/txrx/ol_tx_desc.c Change-Id: I29a06419164afba7c1c391d11aee10742d41b93c CRs-Fixed: 1083068 (cherry picked from commit bcc6b34818654241a4886b35619fb5e901f6f10b) --- core/dp/txrx/ol_tx.c | 6 +++--- core/dp/txrx/ol_tx.h | 9 +++++++++ core/dp/txrx/ol_tx_desc.c | 5 +---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index eccc0507acc3..1f171c07e9e0 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -1354,7 +1354,7 @@ ol_txrx_mgmt_tx_desc_alloc( * address of the initial fragment. */ #if defined(HELIUMPLUS_PADDR64) - /* dump_frag_desc("ol_txrx_mgmt_send(): after ol_tx_desc_ll", + /* ol_txrx_dump_frag_desc("ol_txrx_mgmt_send(): after ol_tx_desc_ll", tx_desc); */ #endif /* defined(HELIUMPLUS_PADDR64) */ if (tx_desc) { @@ -1369,7 +1369,7 @@ ol_txrx_mgmt_tx_desc_alloc( qdf_nbuf_get_frag_paddr(tx_mgmt_frm, 1), 0, 0); #if defined(HELIUMPLUS_PADDR64) && defined(HELIUMPLUS_DEBUG) - dump_frag_desc( + ol_txrx_dump_frag_desc( "after htt_tx_desc_frags_table_set", tx_desc); #endif /* defined(HELIUMPLUS_PADDR64) */ @@ -1701,7 +1701,7 @@ ol_txrx_mgmt_tx_cb_set(ol_txrx_pdev_handle pdev, } #if defined(HELIUMPLUS_PADDR64) -void dump_frag_desc(char *msg, struct ol_tx_desc_t *tx_desc) +void ol_txrx_dump_frag_desc(char *msg, struct ol_tx_desc_t *tx_desc) { uint32_t *frag_ptr_i_p; int i; diff --git a/core/dp/txrx/ol_tx.h b/core/dp/txrx/ol_tx.h index 561900a71dcd..5cb97e825d13 100644 --- a/core/dp/txrx/ol_tx.h +++ b/core/dp/txrx/ol_tx.h @@ -121,4 +121,13 @@ static inline void ol_tso_seg_list_deinit(struct ol_txrx_pdev_t *pdev) } #endif +#if defined(HELIUMPLUS_PADDR64) +void ol_txrx_dump_frag_desc(char *msg, struct ol_tx_desc_t *tx_desc); +#else +static inline +void ol_txrx_dump_frag_desc(char *msg, struct ol_tx_desc_t *tx_desc) +{ +} +#endif + #endif /* _OL_TX__H_ */ diff --git a/core/dp/txrx/ol_tx_desc.c b/core/dp/txrx/ol_tx_desc.c index c4e78ae6de46..ee42722c6fa8 100644 --- a/core/dp/txrx/ol_tx_desc.c +++ b/core/dp/txrx/ol_tx_desc.c @@ -403,9 +403,6 @@ void ol_tx_desc_free(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc) } #endif -extern void -dump_frag_desc(char *msg, struct ol_tx_desc_t *tx_desc); - void dump_pkt(qdf_nbuf_t nbuf, qdf_dma_addr_t nbuf_paddr, int len) { @@ -583,7 +580,7 @@ struct ol_tx_desc_t *ol_tx_desc_ll(struct ol_txrx_pdev_t *pdev, } #if defined(HELIUMPLUS_DEBUG) - dump_frag_desc("ol_tx_desc_ll()", tx_desc); + ol_txrx_dump_frag_desc("ol_tx_desc_ll()", tx_desc); #endif return tx_desc; }