X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_pmd_ring.c;h=0d3d95c6758bade8dad44e6b987b2a4c85028c48;hb=3031749c2df04a63cdcef186dcce3781e61436e8;hp=1fe38fa658fddcf9e61671db06745d2572b859ec;hpb=61934c0956d4816cf4bdb797f943264b9f476095;p=dpdk.git diff --git a/app/test/test_pmd_ring.c b/app/test/test_pmd_ring.c index 1fe38fa658..0d3d95c675 100644 --- a/app/test/test_pmd_ring.c +++ b/app/test/test_pmd_ring.c @@ -1,13 +1,13 @@ /*- * BSD LICENSE - * + * * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * All rights reserved. - * + * * 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 @@ -17,7 +17,7 @@ * * Neither the name of Intel Corporation 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 @@ -65,7 +65,7 @@ test_ethdev_configure(void) struct rte_eth_link link; memset(&null_conf, 0, sizeof(struct rte_eth_conf)); - + if ((TX_PORT >= RTE_MAX_ETHPORTS) || (RX_PORT >= RTE_MAX_ETHPORTS)\ || (RXTX_PORT >= RTE_MAX_ETHPORTS)) { printf(" TX/RX port exceed max eth ports\n"); @@ -206,7 +206,7 @@ test_stats_reset(void) printf("Testing ring PMD stats reset\n"); rte_eth_stats_reset(RXTX_PORT); - + /* check stats of RXTX port, should all be zero */ rte_eth_stats_get(RXTX_PORT, &stats); if (stats.ipackets != 0 || stats.opackets != 0 || @@ -236,7 +236,7 @@ test_stats_reset(void) } rte_eth_stats_reset(RXTX_PORT); - + /* check stats of RXTX port, should all be zero */ rte_eth_stats_get(RXTX_PORT, &stats); if (stats.ipackets != 0 || stats.opackets != 0 || @@ -249,7 +249,7 @@ test_stats_reset(void) return 0; } -static int +static int test_pmd_ring_init(void) { struct rte_eth_stats stats; @@ -330,13 +330,13 @@ test_pmd_ring_pair_create(void) return -1; } - if ((rte_eth_rx_queue_setup(RXTX_PORT4, 0, RING_SIZE, SOCKET0, NULL, mp) < 0) + if ((rte_eth_rx_queue_setup(RXTX_PORT4, 0, RING_SIZE, SOCKET0, NULL, mp) < 0) || (rte_eth_rx_queue_setup(RXTX_PORT5, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)) { printf("RX queue setup failed\n"); return -1; } - if ((rte_eth_dev_start(RXTX_PORT4) < 0) + if ((rte_eth_dev_start(RXTX_PORT4) < 0) || (rte_eth_dev_start(RXTX_PORT5) < 0)) { printf("Error starting RXTX port\n"); return -1; @@ -398,18 +398,18 @@ test_pmd_ring_pair_attach(void) return -1; } - if ((rte_eth_rx_queue_setup(RXTX_PORT4, 0, RING_SIZE, SOCKET0, NULL, mp) < 0) + if ((rte_eth_rx_queue_setup(RXTX_PORT4, 0, RING_SIZE, SOCKET0, NULL, mp) < 0) || (rte_eth_rx_queue_setup(RXTX_PORT5, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)) { printf("RX queue setup failed\n"); return -1; } - if ((rte_eth_dev_start(RXTX_PORT4) < 0) + if ((rte_eth_dev_start(RXTX_PORT4) < 0) || (rte_eth_dev_start(RXTX_PORT5) < 0)) { printf("Error starting RXTX port\n"); return -1; } - + rte_eth_stats_reset(RXTX_PORT4); rte_eth_stats_reset(RXTX_PORT5); @@ -441,7 +441,7 @@ test_pmd_ring_pair_attach(void) rte_eth_dev_stop(RXTX_PORT4); rte_eth_dev_stop(RXTX_PORT5); - + return 0; } @@ -499,7 +499,7 @@ test_pmd_ring(void) return -1; if (test_pmd_ring_pair_attach() < 0) - return -1; + return -1; return 0; }