[PATCH v5 12/22] net/hns3: use mbuf descriptor accessors

[Tyler Retzlaff]

RTE_MARKER typedefs are a GCC extension unsupported by MSVC. Use
new rte_mbuf_rearm_data and rte_mbuf_rx_descriptor_fields1 accessors
that provide a compatible type pointer without using the marker fields.

Signed-off-by: Tyler Retzlaff <roret...@linux.microsoft.com>
---
 drivers/net/hns3/hns3_rxtx_vec.c      |  4 +---
 drivers/net/hns3/hns3_rxtx_vec_neon.h | 16 ++++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/drivers/net/hns3/hns3_rxtx_vec.c b/drivers/net/hns3/hns3_rxtx_vec.c
index 9708ec6..174be45 100644
--- a/drivers/net/hns3/hns3_rxtx_vec.c
+++ b/drivers/net/hns3/hns3_rxtx_vec.c
@@ -113,7 +113,6 @@
 static void
 hns3_rxq_vec_setup_rearm_data(struct hns3_rx_queue *rxq)
 {
-       uintptr_t p;
        struct rte_mbuf mb_def = { .buf_addr = 0 }; /* zeroed mbuf */
 
        mb_def.nb_segs = 1;
@@ -141,8 +140,7 @@
 
        /* prevent compiler reordering: rearm_data covers previous fields */
        rte_compiler_barrier();
-       p = (uintptr_t)&mb_def.rearm_data;
-       rxq->mbuf_initializer = *(uint64_t *)p;
+       rxq->mbuf_initializer = *rte_mbuf_rearm_data(&mb_def);
 }
 
 void
diff --git a/drivers/net/hns3/hns3_rxtx_vec_neon.h 
b/drivers/net/hns3/hns3_rxtx_vec_neon.h
index 0dc6b9f..7b2c3e3 100644
--- a/drivers/net/hns3/hns3_rxtx_vec_neon.h
+++ b/drivers/net/hns3/hns3_rxtx_vec_neon.h
@@ -236,23 +236,23 @@
                pkt_mb4 = vreinterpretq_u8_u16(tmp);
 
                /* save packet info to rx_pkts mbuf */
-               vst1q_u8((void *)&sw_ring[pos + 0].mbuf->rx_descriptor_fields1,
+               vst1q_u8(rte_mbuf_rx_descriptor_fields1(sw_ring[pos + 0].mbuf),
                         pkt_mb1);
-               vst1q_u8((void *)&sw_ring[pos + 1].mbuf->rx_descriptor_fields1,
+               vst1q_u8(rte_mbuf_rx_descriptor_fields1(sw_ring[pos + 1].mbuf),
                         pkt_mb2);
-               vst1q_u8((void *)&sw_ring[pos + 2].mbuf->rx_descriptor_fields1,
+               vst1q_u8(rte_mbuf_rx_descriptor_fields1(sw_ring[pos + 2].mbuf),
                         pkt_mb3);
-               vst1q_u8((void *)&sw_ring[pos + 3].mbuf->rx_descriptor_fields1,
+               vst1q_u8(rte_mbuf_rx_descriptor_fields1(sw_ring[pos + 3].mbuf),
                         pkt_mb4);
 
                /* store the first 8 bytes of packets mbuf's rearm_data */
-               *(uint64_t *)&sw_ring[pos + 0].mbuf->rearm_data =
+               *rte_mbuf_rearm_data(&sw_ring[pos + 0].mbuf) =
                        rxq->mbuf_initializer;
-               *(uint64_t *)&sw_ring[pos + 1].mbuf->rearm_data =
+               *rte_mbuf_rearm_data(&sw_ring[pos + 1].mbuf) =
                        rxq->mbuf_initializer;
-               *(uint64_t *)&sw_ring[pos + 2].mbuf->rearm_data =
+               *rte_mbuf_rearm_data(&sw_ring[pos + 2].mbuf) =
                        rxq->mbuf_initializer;
-               *(uint64_t *)&sw_ring[pos + 3].mbuf->rearm_data =
+               *rte_mbuf_rearm_data(&sw_ring[pos + 3].mbuf) =
                        rxq->mbuf_initializer;
 
                rte_prefetch_non_temporal(rxdp + HNS3_DEFAULT_DESCS_PER_LOOP);
-- 
1.8.3.1