From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 92F987F68 for ; Wed, 19 Nov 2014 15:14:53 +0100 (CET) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 19 Nov 2014 06:25:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,417,1413270000"; d="scan'208";a="624894007" Received: from irsmsx155.ger.corp.intel.com ([163.33.192.3]) by fmsmga001.fm.intel.com with ESMTP; 19 Nov 2014 06:25:16 -0800 Received: from irsmsx108.ger.corp.intel.com ([169.254.11.128]) by IRSMSX155.ger.corp.intel.com ([169.254.14.228]) with mapi id 14.03.0195.001; Wed, 19 Nov 2014 14:25:15 +0000 From: "De Lara Guarch, Pablo" To: "Jastrzebski, MichalX K" , "dev@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH v4 2/2] testpmd: add mode 4 support Thread-Index: AQHQA01w+5GspJR2GUKG7fWCg0j2+JxoACow Date: Wed, 19 Nov 2014 14:25:14 +0000 Message-ID: References: <1416328259-23926-1-git-send-email-michalx.k.jastrzebski@intel.com> <1416328259-23926-3-git-send-email-michalx.k.jastrzebski@intel.com> In-Reply-To: <1416328259-23926-3-git-send-email-michalx.k.jastrzebski@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [163.33.239.181] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v4 2/2] testpmd: add mode 4 support 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: , X-List-Received-Date: Wed, 19 Nov 2014 14:14:54 -0000 Sorry I missed extra comments here: > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Michal Jastrzebski > Sent: Tuesday, November 18, 2014 4:31 PM > To: dev@dpdk.org > Subject: [dpdk-dev] [PATCH v4 2/2] testpmd: add mode 4 support >=20 > From: Pawel Wodkowski >=20 >=20 > Signed-off-by: Pawel Wodkowski > --- > app/test-pmd/cmdline.c | 28 +++++++++++++++++++++++-- > app/test-pmd/csumonly.c | 9 ++++++++ > app/test-pmd/icmpecho.c | 17 ++++++++++++++- > app/test-pmd/iofwd.c | 9 ++++++++ > app/test-pmd/macfwd-retry.c | 9 ++++++++ > app/test-pmd/macfwd.c | 9 ++++++++ > app/test-pmd/macswap.c | 9 ++++++++ > app/test-pmd/testpmd.c | 48 > +++++++++++++++++++++++++++++++++++++------ > app/test-pmd/testpmd.h | 11 ++++++++-- > 9 files changed, 138 insertions(+), 11 deletions(-) >=20 [...] > diff --git a/app/test-pmd/icmpecho.c b/app/test-pmd/icmpecho.c > index 7fd4b6d..e954601 100644 > --- a/app/test-pmd/icmpecho.c > +++ b/app/test-pmd/icmpecho.c > @@ -305,6 +305,9 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs) > uint16_t arp_pro; > uint8_t i; > int l2_len; > +#if RTE_LIBRTE_PMD_BOND Should be #ifdef > + uint8_t force_tx_burst; > +#endif > #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES > uint64_t start_tsc; > uint64_t end_tsc; > @@ -320,8 +323,20 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs) > */ > nb_rx =3D rte_eth_rx_burst(fs->rx_port, fs->rx_queue, pkts_burst, > nb_pkt_per_burst); [...] > index 5740804..68e2987 100644 > --- a/app/test-pmd/testpmd.c > +++ b/app/test-pmd/testpmd.c > @@ -72,6 +72,9 @@ > #include > #include > #include > +#ifdef RTE_LIBRTE_PMD_BOND > +#include > +#endif [...] > +#ifdef RTE_LIBRTE_PMD_BOND > + is_mode4 =3D ports[fs->rx_port].bond_mode =3D=3D > BONDING_MODE_8023AD || > + ports[fs->tx_port].bond_mode =3D=3D > BONDING_MODE_8023AD; > + > + if (is_mode4) { > + if (cur_fwd_config.fwd_eng =3D=3D &rx_only_engine || > + cur_fwd_config.fwd_eng =3D=3D > &tx_only_engine > +#ifdef RTE_LIBRTE_IEEE1588 > + || cur_fwd_config.fwd_eng =3D=3D > &ieee1588_fwd_engine, Remove that comma. > +#endif > + ) { > + printf("Selected forwarding engine '%s' is not > supported in " > + "mode 802.3ad of link bonding.\n", > + cur_fwd_config.fwd_eng- > >fwd_mode_name); > + > + return; > + } > + fs->forward_timeout =3D 100 * rte_get_tsc_hz() / 1000; > + fs->next_forward_time =3D 0; /* force forward */ > + } else > + fs->forward_timeout =3D 0; /* force forward is disabled > */ [...]