From: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Date: Wed, 22 Jul 2015 09:50:11 +0000 (+0100)
Subject: ixgbe: fix build with bulk alloc disabled
X-Git-Tag: spdx-start~8666
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=b50c10cc892ecd2bf84cf3bd046e51ce47c9c5bd;p=dpdk.git

ixgbe: fix build with bulk alloc disabled

ixgbe_recv_pkts_lro uses field rx_free_trigger
in structure ixgbe_rx_queue, but that field is only defined
if IXGBE_RX_ALLOW_BULK_ALLOC is enabled, so even though
that field is not used when it is disabled,
compiler complains about it.
Therefore, the lines of code that use that field
have been ifdef.

Fixes: 8eecb329 ("ixgbe: add LRO support")

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---

diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index 9b2d6377fe..af7e22279f 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -1707,7 +1707,9 @@ next_desc:
 							rx_mbuf_alloc_failed++;
 				break;
 			}
-		} else if (nb_hold > rxq->rx_free_thresh) {
+		}
+#ifdef RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC
+		else if (nb_hold > rxq->rx_free_thresh) {
 			uint16_t next_rdt = rxq->rx_free_trigger;
 
 			if (!ixgbe_rx_alloc_bufs(rxq, false)) {
@@ -1725,6 +1727,7 @@ next_desc:
 				break;
 			}
 		}
+#endif
 
 		nb_hold++;
 		rxe = &sw_ring[rx_id];