From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 834152BB9 for ; Thu, 15 Jun 2017 13:37:30 +0200 (CEST) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP; 15 Jun 2017 04:37:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,343,1493708400"; d="scan'208";a="274612736" Received: from rnicolau-mobl.ger.corp.intel.com (HELO [10.237.221.56]) ([10.237.221.56]) by fmsmga004.fm.intel.com with ESMTP; 15 Jun 2017 04:37:28 -0700 To: Thomas Monjalon Cc: wenzhuo.lu@intel.com, dev@dpdk.org References: <20170615095446.2187-1-thomas@monjalon.net> From: Radu Nicolau Message-ID: Date: Thu, 15 Jun 2017 12:37:28 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.1.0 MIME-Version: 1.0 In-Reply-To: <20170615095446.2187-1-thomas@monjalon.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US Subject: Re: [dpdk-dev] [PATCH] app/testpmd: fix build without ixgbe X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jun 2017 11:37:31 -0000 Looks ok to me, but why would one enable IXGBE_BYPASS without enabling IXGBE? On 6/15/2017 10:54 AM, Thomas Monjalon wrote: > When ixgbe bypass is not explictly disabled while ixgbe is disabled: > app/test-pmd/testpmd.c:304:27: error: > ‘RTE_PMD_IXGBE_BYPASS_TMT_OFF’ undeclared here > > The ixgbe bypass feature is meaningful only if ixgbe is enabled. > So we need to check both. > > A best fix will be to enable bypass always and remove this option. > > Fixes: e261265e42a1 ("ethdev: move bypass functions to ixgbe PMD") > > Signed-off-by: Thomas Monjalon > --- > app/test-pmd/cmdline.c | 8 ++++---- > app/test-pmd/testpmd.c | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c > index b84c1ab40..7f5373a7e 100644 > --- a/app/test-pmd/cmdline.c > +++ b/app/test-pmd/cmdline.c > @@ -3928,7 +3928,7 @@ cmd_set_bypass_mode_parsed(void *parsed_result, > portid_t port_id = res->port_id; > int32_t rc = -EINVAL; > > -#ifdef RTE_LIBRTE_IXGBE_BYPASS > +#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS > uint32_t bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NORMAL; > > if (!strcmp(res->value, "bypass")) > @@ -3996,7 +3996,7 @@ cmd_set_bypass_event_parsed(void *parsed_result, > struct cmd_set_bypass_event_result *res = parsed_result; > portid_t port_id = res->port_id; > > -#ifdef RTE_LIBRTE_IXGBE_BYPASS > +#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS > uint32_t bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_NONE; > uint32_t bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NORMAL; > > @@ -4101,7 +4101,7 @@ cmd_set_bypass_timeout_parsed(void *parsed_result, > { > __rte_unused struct cmd_set_bypass_timeout_result *res = parsed_result; > > -#ifdef RTE_LIBRTE_IXGBE_BYPASS > +#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS > if (!strcmp(res->value, "1.5")) > bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_1_5_SEC; > else if (!strcmp(res->value, "2")) > @@ -4164,7 +4164,7 @@ cmd_show_bypass_config_parsed(void *parsed_result, > struct cmd_show_bypass_config_result *res = parsed_result; > portid_t port_id = res->port_id; > int rc = -EINVAL; > -#ifdef RTE_LIBRTE_IXGBE_BYPASS > +#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS > uint32_t event_mode; > uint32_t bypass_mode; > uint32_t timeout = bypass_timeout; > diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c > index d32cbb96d..b29328a69 100644 > --- a/app/test-pmd/testpmd.c > +++ b/app/test-pmd/testpmd.c > @@ -299,7 +299,7 @@ uint32_t event_print_mask = (UINT32_C(1) << RTE_ETH_EVENT_UNKNOWN) | > * NIC bypass mode configuration options. > */ > > -#ifdef RTE_LIBRTE_IXGBE_BYPASS > +#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS > /* The NIC bypass watchdog timeout. */ > uint32_t bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_OFF; > #endif > @@ -2015,7 +2015,7 @@ init_port_config(void) > rte_eth_macaddr_get(pid, &port->eth_addr); > > map_port_queue_stats_mapping_registers(pid, port); > -#ifdef RTE_LIBRTE_IXGBE_BYPASS > +#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS > rte_pmd_ixgbe_bypass_init(pid); > #endif >