From patchwork Fri Mar 20 13:59:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ananyev, Konstantin" X-Patchwork-Id: 4087 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 098BF5A8A; Fri, 20 Mar 2015 14:59:54 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 0AA245A76 for ; Fri, 20 Mar 2015 14:59:51 +0100 (CET) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP; 20 Mar 2015 06:59:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,437,1422950400"; d="scan'208";a="543818464" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga003.jf.intel.com with ESMTP; 20 Mar 2015 06:59:50 -0700 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id t2KDxns7005215; Fri, 20 Mar 2015 13:59:49 GMT Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id t2KDxn7j006617; Fri, 20 Mar 2015 13:59:49 GMT Received: (from kananye1@localhost) by sivswdev02.ir.intel.com with id t2KDxnw8006613; Fri, 20 Mar 2015 13:59:49 GMT From: Konstantin Ananyev To: dev@dpdk.org Date: Fri, 20 Mar 2015 13:59:37 +0000 Message-Id: <1426859977-6559-1-git-send-email-konstantin.ananyev@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1426767878-25468-1-git-send-email-pablo.de.lara.guarch@intel.com> References: <1426767878-25468-1-git-send-email-pablo.de.lara.guarch@intel.com> Subject: [dpdk-dev] [PATCHv2] ixgbe: fix compilation issue when RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC is disabled X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" v2: As per comments, reorder patch a bit, to avoid reintroducing extra ifdefs. Signed-off-by: Konstantin Ananyev Acked-by: Pablo de Lara --- lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 11 +++++++++++ lib/librte_pmd_ixgbe/ixgbe_rxtx.h | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c index 42f0aa5..7b603d0 100644 --- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c +++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c @@ -1170,6 +1170,17 @@ ixgbe_recv_pkts_bulk_alloc(void *rx_queue, struct rte_mbuf **rx_pkts, return nb_rx; } + +#else + +/* Stub to avoid extra ifdefs */ +static uint16_t +ixgbe_recv_pkts_bulk_alloc(__rte_unused void *rx_queue, + __rte_unused struct rte_mbuf **rx_pkts, __rte_unused uint16_t nb_pkts) +{ + return 0; +} + #endif /* RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC */ uint16_t diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.h b/lib/librte_pmd_ixgbe/ixgbe_rxtx.h index 3937cf6..0d549a0 100644 --- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.h +++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.h @@ -36,9 +36,9 @@ #define RTE_PMD_IXGBE_TX_MAX_BURST 32 +#define RTE_PMD_IXGBE_RX_MAX_BURST 32 #ifdef RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC -#define RTE_PMD_IXGBE_RX_MAX_BURST 32 #define RTE_IXGBE_DESCS_PER_LOOP 4 #elif defined(RTE_IXGBE_INC_VECTOR) #define RTE_IXGBE_DESCS_PER_LOOP 4