[PATCH v2 07/11] net/nfp: use the DPDK defined function

[Chaoyong He]

Use the DPDK defined function to replace the user defined macro, to make
the logic more standard.

Signed-off-by: Chaoyong He <chaoyong...@corigine.com>
Reviewed-by: Peng Zhang <peng.zh...@corigine.com>
---
 drivers/net/nfp/flower/nfp_flower_ctrl.c | 2 +-
 drivers/net/nfp/nfp_rxtx.c               | 4 ++--
 drivers/net/nfp/nfp_rxtx.h               | 3 ---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c 
b/drivers/net/nfp/flower/nfp_flower_ctrl.c
index d19b60bc69..c25487c277 100644
--- a/drivers/net/nfp/flower/nfp_flower_ctrl.c
+++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c
@@ -109,7 +109,7 @@ nfp_flower_ctrl_vnic_recv(void *rx_queue,
                /* Now resetting and updating the descriptor */
                rxds->vals[0] = 0;
                rxds->vals[1] = 0;
-               dma_addr = rte_cpu_to_le_64(RTE_MBUF_DMA_ADDR_DEFAULT(new_mb));
+               dma_addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(new_mb));
                rxds->fld.dd = 0;
                rxds->fld.dma_addr_hi = (dma_addr >> 32) & 0xffff;
                rxds->fld.dma_addr_lo = dma_addr & 0xffffffff;
diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c
index 38ce83aa46..be1ac32c73 100644
--- a/drivers/net/nfp/nfp_rxtx.c
+++ b/drivers/net/nfp/nfp_rxtx.c
@@ -184,7 +184,7 @@ nfp_net_rx_fill_freelist(struct nfp_net_rxq *rxq)
                        return -ENOMEM;
                }
 
-               dma_addr = rte_cpu_to_le_64(RTE_MBUF_DMA_ADDR_DEFAULT(mbuf));
+               dma_addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(mbuf));
 
                rxd = &rxq->rxds[i];
                rxd->fld.dd = 0;
@@ -752,7 +752,7 @@ nfp_net_recv_pkts(void *rx_queue,
                /* Now resetting and updating the descriptor */
                rxds->vals[0] = 0;
                rxds->vals[1] = 0;
-               dma_addr = rte_cpu_to_le_64(RTE_MBUF_DMA_ADDR_DEFAULT(new_mb));
+               dma_addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(new_mb));
                rxds->fld.dd = 0;
                rxds->fld.dma_addr_hi = (dma_addr >> 32) & 0xffff;
                rxds->fld.dma_addr_lo = dma_addr & 0xffffffff;
diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h
index ff1019b690..5695a31636 100644
--- a/drivers/net/nfp/nfp_rxtx.h
+++ b/drivers/net/nfp/nfp_rxtx.h
@@ -10,9 +10,6 @@
 
 #define NFP_DESC_META_LEN(d) ((d)->rxd.meta_len_dd & 
PCIE_DESC_RX_META_LEN_MASK)
 
-#define RTE_MBUF_DMA_ADDR_DEFAULT(mb) \
-       ((uint64_t)((mb)->buf_iova + RTE_PKTMBUF_HEADROOM))
-
 /* Maximum number of NFP packet metadata fields. */
 #define NFP_META_MAX_FIELDS      8
 
-- 
2.39.1