From b2595c4aa92d412e03eed6223db229ae971bb64c Mon Sep 17 00:00:00 2001 From: "Richardson, Bruce" Date: Tue, 26 Nov 2013 11:07:52 +0000 Subject: [PATCH] igb/ixgbe: fix build with ICC ICC requires an initializer be given for the static variables, so adding one in cases where one wasn't previously given. This problem was introduced in commit e8ae856140bce4e (fix index overflow when resetting big queues). Signed-off-by: Bruce Richardson Acked-by: Thomas Monjalon --- lib/librte_pmd_e1000/igb_rxtx.c | 6 ++++-- lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/librte_pmd_e1000/igb_rxtx.c b/lib/librte_pmd_e1000/igb_rxtx.c index c5508c11d2..423ad76ba9 100644 --- a/lib/librte_pmd_e1000/igb_rxtx.c +++ b/lib/librte_pmd_e1000/igb_rxtx.c @@ -1134,7 +1134,8 @@ igb_reset_tx_queue_stat(struct igb_tx_queue *txq) static void igb_reset_tx_queue(struct igb_tx_queue *txq, struct rte_eth_dev *dev) { - static const union e1000_adv_tx_desc zeroed_desc; + static const union e1000_adv_tx_desc zeroed_desc = { .read = { + .buffer_addr = 0}}; struct igb_tx_entry *txe = txq->sw_ring; uint16_t i, prev; struct e1000_hw *hw; @@ -1294,7 +1295,8 @@ eth_igb_rx_queue_release(void *rxq) static void igb_reset_rx_queue(struct igb_rx_queue *rxq) { - static const union e1000_adv_rx_desc zeroed_desc; + static const union e1000_adv_rx_desc zeroed_desc = { .read = { + .pkt_addr = 0}}; unsigned i; /* Zero out HW ring memory */ diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c index cf27a24bda..6f8291893d 100644 --- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c +++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c @@ -1797,7 +1797,8 @@ ixgbe_dev_tx_queue_release(void *txq) static void ixgbe_reset_tx_queue(struct igb_tx_queue *txq) { - static const union ixgbe_adv_tx_desc zeroed_desc; + static const union ixgbe_adv_tx_desc zeroed_desc = { .read = { + .buffer_addr = 0}}; struct igb_tx_entry *txe = txq->sw_ring; uint16_t prev, i; @@ -2092,7 +2093,8 @@ check_rx_burst_bulk_alloc_preconditions(__rte_unused struct igb_rx_queue *rxq) static void ixgbe_reset_rx_queue(struct igb_rx_queue *rxq) { - static const union ixgbe_adv_rx_desc zeroed_desc; + static const union ixgbe_adv_rx_desc zeroed_desc = { .read = { + .pkt_addr = 0}}; unsigned i; uint16_t len; -- 2.20.1