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/thunderx/nicvf_ethdev.c | 4 ++-- drivers/net/thunderx/nicvf_rxtx.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c index a504d41..4dd5577 100644 --- a/drivers/net/thunderx/nicvf_ethdev.c +++ b/drivers/net/thunderx/nicvf_ethdev.c @@ -1323,9 +1323,9 @@ enum nicvf_link_speed { mb_def.port = rxq->port_id; rte_mbuf_refcnt_set(&mb_def, 1); - /* Prevent compiler reordering: rearm_data covers previous fields */ + /* Prevent compiler reordering: mbuf_rearm_data covers previous fields */ rte_compiler_barrier(); - p = (uintptr_t)&mb_def.rearm_data; + p = (uintptr_t)&mb_def.mbuf_rearm_data; rxq->mbuf_initializer.value = *(uint64_t *)p; } diff --git a/drivers/net/thunderx/nicvf_rxtx.h b/drivers/net/thunderx/nicvf_rxtx.h index 4b83e33..67bc701 100644 --- a/drivers/net/thunderx/nicvf_rxtx.h +++ b/drivers/net/thunderx/nicvf_rxtx.h @@ -66,7 +66,7 @@ static inline uint16_t __attribute__((const)) #else init.value += apad; #endif - *(uint64_t *)(&pkt->rearm_data) = init.value; + *(uint64_t *)(&pkt->mbuf_rearm_data) = init.value; } static inline void @@ -80,7 +80,7 @@ static inline uint16_t __attribute__((const)) init.value += apad; #endif init.fields.nb_segs = nb_segs; - *(uint64_t *)(&pkt->rearm_data) = init.value; + *(uint64_t *)(&pkt->mbuf_rearm_data) = init.value; } uint32_t nicvf_dev_rx_queue_count(void *rx_queue); -- 1.8.3.1