diff options
| author | Poddar, Siddarth <siddpodd@codeaurora.org> | 2016-11-23 18:19:49 +0530 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2016-11-30 15:53:30 -0800 |
| commit | fe1b52f4add92f5d603b316231679e0cd23245a1 (patch) | |
| tree | a7ed462b70b9d7d78fafa133e573758c34b10d3c | |
| parent | d46a9c6b1b242e5e961e79c292a5f7a9aa39a56f (diff) | |
qcacld-3.0: Fix improper naming and exporting of dump_pkt()
Fix improper naming and exporting of dump_pkt() by:
1) adding ol_txrx prefix in the api
2) adding prototype of api to ol_txrx.h and removing the local
prototype for the api from core/dp/txrx/ol_tx_desc.c
CRs-Fixed: 1093667
Change-Id: I14e547223f8c96f10897aa6dc5c9781018a4d986
| -rw-r--r-- | core/dp/htt/htt_rx.c | 5 | ||||
| -rw-r--r-- | core/dp/txrx/ol_tx.c | 2 | ||||
| -rw-r--r-- | core/dp/txrx/ol_tx_desc.c | 11 | ||||
| -rw-r--r-- | core/dp/txrx/ol_txrx.c | 9 | ||||
| -rw-r--r-- | core/dp/txrx/ol_txrx.h | 11 |
5 files changed, 23 insertions, 15 deletions
diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c index e61c9ffe57ac..317009ce71ab 100644 --- a/core/dp/htt/htt_rx.c +++ b/core/dp/htt/htt_rx.c @@ -1901,9 +1901,6 @@ void htt_rx_mon_note_capture_channel(htt_pdev_handle pdev, int mon_ch) ch_info->ch_freq = cds_chan_to_freq(mon_ch); } -extern void -dump_pkt(qdf_nbuf_t nbuf, uint32_t nbuf_paddr, int len); - uint32_t htt_rx_amsdu_rx_in_order_get_pktlog(qdf_nbuf_t rx_ind_msg) { uint32_t *msg_word; @@ -2006,7 +2003,7 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev, HTT_RX_IN_ORD_PADDR_IND_MSDU_LEN_GET( *(msg_word + NEXT_FIELD_OFFSET_IN32)))); #if defined(HELIUMPLUS_DEBUG) - dump_pkt(msdu, 0, 64); + ol_txrx_dump_pkt(msdu, 0, 64); #endif *((uint8_t *) &rx_desc->fw_desc.u.val) = HTT_RX_IN_ORD_PADDR_IND_FW_DESC_GET(*(msg_word + NEXT_FIELD_OFFSET_IN32)); diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index 6baf16eb0c1a..c0c5806c65bb 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -464,7 +464,7 @@ ol_tx_prepare_ll_fast(struct ol_txrx_pdev_t *pdev, qdf_print("%s:%d: htt_fdesc=%p frag=%d frag_paddr=0x%0llx len=%zu", __func__, __LINE__, tx_desc->htt_frag_desc, i-1, frag_paddr, frag_len); - dump_pkt(netbuf, frag_paddr, 64); + ol_txrx_dump_pkt(netbuf, frag_paddr, 64); #endif /* HELIUMPLUS_DEBUG */ #else /* ! defined(HELIUMPLUSPADDR64) */ htt_tx_desc_frag(pdev->htt_pdev, tx_desc->htt_tx_desc, diff --git a/core/dp/txrx/ol_tx_desc.c b/core/dp/txrx/ol_tx_desc.c index 43d65f93e715..3f5feef36e36 100644 --- a/core/dp/txrx/ol_tx_desc.c +++ b/core/dp/txrx/ol_tx_desc.c @@ -400,15 +400,6 @@ void ol_tx_desc_free(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc) } #endif -void -dump_pkt(qdf_nbuf_t nbuf, qdf_dma_addr_t nbuf_paddr, int len) -{ - qdf_print("%s: Pkt: VA 0x%p PA 0x%llx len %d\n", __func__, - qdf_nbuf_data(nbuf), (long long unsigned int)nbuf_paddr, len); - print_hex_dump(KERN_DEBUG, "Pkt: ", DUMP_PREFIX_ADDRESS, 16, 4, - qdf_nbuf_data(nbuf), len, true); -} - const uint32_t htt_to_ce_pkt_type[] = { [htt_pkt_type_raw] = tx_pkt_type_raw, [htt_pkt_type_native_wifi] = tx_pkt_type_native_wifi, @@ -567,7 +558,7 @@ struct ol_tx_desc_t *ol_tx_desc_ll(struct ol_txrx_pdev_t *pdev, qdf_print("%s:%d: htt_fdesc=%p frag=%d frag_vaddr=0x%p frag_paddr=0x%llx len=%zu\n", __func__, __LINE__, tx_desc->htt_frag_desc, i-1, frag_vaddr, frag_paddr, frag_len); - dump_pkt(netbuf, frag_paddr, 64); + ol_txrx_dump_pkt(netbuf, frag_paddr, 64); #endif /* HELIUMPLUS_DEBUG */ #else /* ! defined(HELIUMPLUSPADDR64) */ htt_tx_desc_frag(pdev->htt_pdev, tx_desc->htt_tx_desc, i - 1, diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index fdb452bf0613..057f93decba6 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -4846,6 +4846,15 @@ void ol_deregister_lro_flush_cb(void (lro_deinit_cb)(void *)) } #endif /* FEATURE_LRO */ +void +ol_txrx_dump_pkt(qdf_nbuf_t nbuf, uint32_t nbuf_paddr, int len) +{ + qdf_print("%s: Pkt: VA 0x%p PA 0x%llx len %d\n", __func__, + qdf_nbuf_data(nbuf), (unsigned long long int)nbuf_paddr, len); + print_hex_dump(KERN_DEBUG, "Pkt: ", DUMP_PREFIX_ADDRESS, 16, 4, + qdf_nbuf_data(nbuf), len, true); +} + /** * ol_txrx_get_vdev_from_vdev_id() - get vdev from vdev_id * @vdev_id: vdev_id diff --git a/core/dp/txrx/ol_txrx.h b/core/dp/txrx/ol_txrx.h index daa4f0fde410..c38e4905c522 100644 --- a/core/dp/txrx/ol_txrx.h +++ b/core/dp/txrx/ol_txrx.h @@ -128,6 +128,17 @@ ol_txrx_update_last_real_peer( } #endif +/** + * ol_txrx_dump_pkt() - display the data in buffer and buffer's address + * @nbuf: buffer which contains data to be displayed + * @nbuf_paddr: physical address of the buffer + * @len: defines the size of the data to be displayed + * + * Return: None + */ +void +ol_txrx_dump_pkt(qdf_nbuf_t nbuf, uint32_t nbuf_paddr, int len); + ol_txrx_vdev_handle ol_txrx_get_vdev_from_vdev_id(uint8_t vdev_id); void htt_pkt_log_init(struct ol_txrx_pdev_t *handle, void *scn); |
