From: Richardson, Bruce <bruce.richardson@intel.com>
Date: Tue, 26 Nov 2013 11:07:52 +0000 (+0000)
Subject: igb/ixgbe: fix build with ICC
X-Git-Tag: spdx-start~11059
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=b2595c4aa92d412e03eed6223db229ae971bb64c;p=dpdk.git

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 <bruce.richardson@intel.com>
Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---

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;