From 0a88485379fa9b927d8a3383d422e88998d34118 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 3 Nov 2014 17:01:08 +0000 Subject: [PATCH] ixgbe: fix build with icc When using Intel C++ compiler(icc) 14.0.1.106 or the older icc 13.x version, the mbuf initializer variable was not getting configured correctly, as the mb_def variable was not set correctly. This is due to an issue with icc (DPD200249565 which already been fixed in icc 14.0.2 and newer compiler release) where it incorrectly calculates the field offsets with initializers when zero-sized fields are used in a structure. To work around this, the code in ixgbe_rxq_vec_setup does not setup the fields using an initializer, but instead assigns the values individually in code. NOTE: There is no performance impact to this change as the queue setup functions are not data-plane APIs, but are only used at app initialization. Signed-off-by: Bruce Richardson Reviewed-by: David Marchand Acked-by: Thomas Monjalon --- lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c index e813e437b2..42c0f60142 100644 --- a/lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c +++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c @@ -730,16 +730,13 @@ static struct ixgbe_txq_ops vec_txq_ops = { int ixgbe_rxq_vec_setup(struct igb_rx_queue *rxq) { - struct rte_mbuf mb_def = { - .nb_segs = 1, - .data_off = RTE_PKTMBUF_HEADROOM, -#ifdef RTE_MBUF_REFCNT - { .refcnt = 1, } -#endif - }; + struct rte_mbuf mb_def = { .buf_addr = 0 }; /* zeroed mbuf */ + mb_def.nb_segs = 1; + mb_def.data_off = RTE_PKTMBUF_HEADROOM; mb_def.buf_len = rxq->mb_pool->elt_size - sizeof(struct rte_mbuf); mb_def.port = rxq->port_id; + rte_mbuf_refcnt_set(&mb_def, 1); rxq->mbuf_initializer = *((uint64_t *)&mb_def.rearm_data); return 0; } -- 2.20.1