From c866aaa8544958bbed247addb5c1db530bb133dd Mon Sep 17 00:00:00 2001 From: Damien Millescamps Date: Tue, 15 May 2012 16:27:04 +0200 Subject: [PATCH] app/testpmd: fix config crash A chained topology must always have an increment of 1. Here, it was 2 if ports number is even. Signed-off-by: Damien Millescamps Acked-by: Ivan Boule Acked-by: Thomas Monjalon --- app/test-pmd/config.c | 49 +++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 64d7855147..f85540c762 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -31,6 +31,36 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ +/* BSD LICENSE + * + * Copyright(c) 2013 6WIND. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of 6WIND S.A. nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #include #include @@ -648,17 +678,14 @@ simple_fwd_config_setup(void) portid_t j; portid_t inc = 2; - if (nb_fwd_ports % 2) { - if (port_topology == PORT_TOPOLOGY_CHAINED) { - inc = 1; - } - else { - printf("\nWarning! Cannot handle an odd number of ports " - "with the current port topology. Configuration " - "must be changed to have an even number of ports, " - "or relaunch application with " - "--port-topology=chained\n\n"); - } + if (port_topology == PORT_TOPOLOGY_CHAINED) { + inc = 1; + } else if (nb_fwd_ports % 2) { + printf("\nWarning! Cannot handle an odd number of ports " + "with the current port topology. Configuration " + "must be changed to have an even number of ports, " + "or relaunch application with " + "--port-topology=chained\n\n"); } cur_fwd_config.nb_fwd_ports = (portid_t) nb_fwd_ports; -- 2.20.1