[PATCH v4 13/18] net/ionic: stop using zero sized marker fields

[Tyler Retzlaff]

Update to reference newly named anonymous union markers supported by
standard C and stop referencing zero sized compiler extension markers.

Signed-off-by: Tyler Retzlaff <roret...@linux.microsoft.com>
---
 drivers/net/ionic/ionic_lif.c         | 8 ++++----
 drivers/net/ionic/ionic_rxtx_sg.c     | 4 ++--
 drivers/net/ionic/ionic_rxtx_simple.c | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c
index 25b490d..6497d43 100644
--- a/drivers/net/ionic/ionic_lif.c
+++ b/drivers/net/ionic/ionic_lif.c
@@ -725,8 +725,8 @@
 
        rte_compiler_barrier();
 
-       RTE_BUILD_BUG_ON(sizeof(rxm.rearm_data[0]) != sizeof(uint64_t));
-       return rxm.rearm_data[0];
+       RTE_BUILD_BUG_ON(sizeof(rxm.mbuf_rearm_data) != sizeof(uint64_t));
+       return *(uint64_t *)&rxm.mbuf_rearm_data[0];
 }
 
 static uint64_t
@@ -743,8 +743,8 @@
 
        rte_compiler_barrier();
 
-       RTE_BUILD_BUG_ON(sizeof(rxm.rearm_data[0]) != sizeof(uint64_t));
-       return rxm.rearm_data[0];
+       RTE_BUILD_BUG_ON(sizeof(rxm.mbuf_rearm_data) != sizeof(uint64_t));
+       return *(uint64_t *)&rxm.mbuf_rearm_data[0];
 }
 
 int
diff --git a/drivers/net/ionic/ionic_rxtx_sg.c 
b/drivers/net/ionic/ionic_rxtx_sg.c
index ab8e56e..b12a257 100644
--- a/drivers/net/ionic/ionic_rxtx_sg.c
+++ b/drivers/net/ionic/ionic_rxtx_sg.c
@@ -285,7 +285,7 @@
        info[0] = NULL;
 
        /* Set the mbuf metadata based on the cq entry */
-       rxm->rearm_data[0] = rxq->rearm_data;
+       *(uint64_t *)&rxm->mbuf_rearm_data[0] = rxq->rearm_data;
        rxm->pkt_len = cq_desc_len;
        rxm->data_len = RTE_MIN(rxq->hdr_seg_size, cq_desc_len);
        left = cq_desc_len - rxm->data_len;
@@ -298,7 +298,7 @@
                info[i] = NULL;
 
                /* Set the chained mbuf metadata */
-               rxm_seg->rearm_data[0] = rxq->rearm_seg_data;
+               *(uint64_t *)&rxm_seg->mbuf_rearm_data[0] = rxq->rearm_seg_data;
                rxm_seg->data_len = RTE_MIN(rxq->seg_size, left);
                left -= rxm_seg->data_len;
 
diff --git a/drivers/net/ionic/ionic_rxtx_simple.c 
b/drivers/net/ionic/ionic_rxtx_simple.c
index 5f81856..37b51a6 100644
--- a/drivers/net/ionic/ionic_rxtx_simple.c
+++ b/drivers/net/ionic/ionic_rxtx_simple.c
@@ -256,7 +256,7 @@
        info[0] = NULL;
 
        /* Set the mbuf metadata based on the cq entry */
-       rxm->rearm_data[0] = rxq->rearm_data;
+       *(uint64_t *)&rxm->mbuf_rearm_data[0] = rxq->rearm_data;
        rxm->pkt_len = cq_desc_len;
        rxm->data_len = cq_desc_len;
 
-- 
1.8.3.1