Sorry I missed extra comments here: > -----Original Message----- > From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of Michal Jastrzebski > Sent: Tuesday, November 18, 2014 4:31 PM > To: dev at dpdk.org > Subject: [dpdk-dev] [PATCH v4 2/2] testpmd: add mode 4 support > > From: Pawel Wodkowski <pawelx.wodkowski at intel.com> > > > Signed-off-by: Pawel Wodkowski <pawelx.wodkowski at intel.com> > --- > 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(-) >
[...] > 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 = 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 <rte_ether.h> > #include <rte_ethdev.h> > #include <rte_string_fns.h> > +#ifdef RTE_LIBRTE_PMD_BOND > +#include <rte_eth_bond.h> > +#endif [...] > +#ifdef RTE_LIBRTE_PMD_BOND > + is_mode4 = ports[fs->rx_port].bond_mode == > BONDING_MODE_8023AD || > + ports[fs->tx_port].bond_mode == > BONDING_MODE_8023AD; > + > + if (is_mode4) { > + if (cur_fwd_config.fwd_eng == &rx_only_engine || > + cur_fwd_config.fwd_eng == > &tx_only_engine > +#ifdef RTE_LIBRTE_IEEE1588 > + || cur_fwd_config.fwd_eng == > &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 = 100 * rte_get_tsc_hz() / 1000; > + fs->next_forward_time = 0; /* force forward */ > + } else > + fs->forward_timeout = 0; /* force forward is disabled > */ [...]