[PATCH v2 01/11] net/nfp: use the suitable helper macro

[Chaoyong He]

Replace the `rte_pktmbuf_mtod()` macro to with the more suitable
`rte_pktmbuf_mtod_offset()`.

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

diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.c 
b/drivers/net/nfp/flower/nfp_flower_cmsg.c
index 2ec9498d22..4013b32fd0 100644
--- a/drivers/net/nfp/flower/nfp_flower_cmsg.c
+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.c
@@ -13,7 +13,7 @@
 static char*
 nfp_flower_cmsg_get_data(struct rte_mbuf *m)
 {
-       return rte_pktmbuf_mtod(m, char *) + 4 + 4 + NFP_FLOWER_CMSG_HLEN;
+       return rte_pktmbuf_mtod_offset(m, char *, 4 + 4 + NFP_FLOWER_CMSG_HLEN);
 }
 
 static void *
diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c 
b/drivers/net/nfp/flower/nfp_flower_ctrl.c
index b4be28ccdf..d19b60bc69 100644
--- a/drivers/net/nfp/flower/nfp_flower_ctrl.c
+++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c
@@ -375,7 +375,7 @@ nfp_flower_cmsg_rx_stats(struct nfp_flow_priv *flow_priv,
        uint32_t ctx_id;
        struct nfp_flower_stats_frame *stats;
 
-       msg = rte_pktmbuf_mtod(mbuf, char *) + NFP_FLOWER_CMSG_HLEN;
+       msg = rte_pktmbuf_mtod_offset(mbuf, char *, NFP_FLOWER_CMSG_HLEN);
        msg_len = mbuf->data_len - NFP_FLOWER_CMSG_HLEN;
        count = msg_len / sizeof(struct nfp_flower_stats_frame);
 
@@ -398,7 +398,7 @@ nfp_flower_cmsg_rx_qos_stats(struct nfp_mtr_priv *mtr_priv,
        struct nfp_mtr *mtr;
        struct nfp_mtr_stats_reply *mtr_stats;
 
-       msg = rte_pktmbuf_mtod(mbuf, char *) + NFP_FLOWER_CMSG_HLEN;
+       msg = rte_pktmbuf_mtod_offset(mbuf, char *, NFP_FLOWER_CMSG_HLEN);
 
        mtr_stats = (struct nfp_mtr_stats_reply *)msg;
        profile_id = rte_be_to_cpu_32(mtr_stats->head.profile_id);
diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c
index fc94e5f0b9..644be2700e 100644
--- a/drivers/net/nfp/nfp_rxtx.c
+++ b/drivers/net/nfp/nfp_rxtx.c
@@ -448,8 +448,7 @@ nfp_net_parse_meta(struct nfp_net_rx_desc *rxds,
        if (unlikely(NFP_DESC_META_LEN(rxds) == 0))
                return;
 
-       meta_base = rte_pktmbuf_mtod(mb, uint8_t *);
-       meta_base -= NFP_DESC_META_LEN(rxds);
+       meta_base = rte_pktmbuf_mtod_offset(mb, uint8_t *, 
-NFP_DESC_META_LEN(rxds));
        meta_header = *(rte_be32_t *)meta_base;
 
        switch (hw->meta_format) {
-- 
2.39.1