New upstream version 17.08

[deb_dpdk.git] / examples / bond / main.c

diff --git a/examples/bond/main.c b/examples/bond/main.c
index 9a4ec80..2d019d4 100644 (file)
--- a/examples/bond/main.c
+++ b/examples/bond/main.c
@@ -53,7 +53,6 @@
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
 #include <rte_eal.h>
-#include <rte_per_lcore.h>
 #include <rte_launch.h>
 #include <rte_atomic.h>
 #include <rte_cycles.h>
@@ -67,10 +66,8 @@
 #include <rte_debug.h>
 #include <rte_ether.h>
 #include <rte_ethdev.h>
-#include <rte_log.h>
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
-#include <rte_memcpy.h>
 #include <rte_ip.h>
 #include <rte_tcp.h>
 #include <rte_arp.h>
@@ -177,6 +174,8 @@ static void
 slave_port_init(uint8_t portid, struct rte_mempool *mbuf_pool)
 {
        int retval;
+       uint16_t nb_rxd = RTE_RX_DESC_DEFAULT;
+       uint16_t nb_txd = RTE_TX_DESC_DEFAULT;
 
        if (portid >= rte_eth_dev_count())
                rte_exit(EXIT_FAILURE, "Invalid port\n");
@@ -186,8 +185,13 @@ slave_port_init(uint8_t portid, struct rte_mempool *mbuf_pool)
                rte_exit(EXIT_FAILURE, "port %u: configuration failed (res=%d)\n",
                                portid, retval);
 
+       retval = rte_eth_dev_adjust_nb_rx_tx_desc(portid, &nb_rxd, &nb_txd);
+       if (retval != 0)
+               rte_exit(EXIT_FAILURE, "port %u: rte_eth_dev_adjust_nb_rx_tx_desc "
+                               "failed (res=%d)\n", portid, retval);
+
        /* RX setup */
-       retval = rte_eth_rx_queue_setup(portid, 0, RTE_RX_DESC_DEFAULT,
+       retval = rte_eth_rx_queue_setup(portid, 0, nb_rxd,
                                        rte_eth_dev_socket_id(portid), NULL,
                                        mbuf_pool);
        if (retval < 0)
@@ -195,7 +199,7 @@ slave_port_init(uint8_t portid, struct rte_mempool *mbuf_pool)
                                portid, retval);
 
        /* TX setup */
-       retval = rte_eth_tx_queue_setup(portid, 0, RTE_TX_DESC_DEFAULT,
+       retval = rte_eth_tx_queue_setup(portid, 0, nb_txd,
                                rte_eth_dev_socket_id(portid), NULL);
 
        if (retval < 0)
@@ -221,6 +225,8 @@ bond_port_init(struct rte_mempool *mbuf_pool)
 {
        int retval;
        uint8_t i;
+       uint16_t nb_rxd = RTE_RX_DESC_DEFAULT;
+       uint16_t nb_txd = RTE_TX_DESC_DEFAULT;
 
        retval = rte_eth_bond_create("bond0", BONDING_MODE_ALB,
                        0 /*SOCKET_ID_ANY*/);
@@ -235,8 +241,13 @@ bond_port_init(struct rte_mempool *mbuf_pool)
                rte_exit(EXIT_FAILURE, "port %u: configuration failed (res=%d)\n",
                                BOND_PORT, retval);
 
+       retval = rte_eth_dev_adjust_nb_rx_tx_desc(BOND_PORT, &nb_rxd, &nb_txd);
+       if (retval != 0)
+               rte_exit(EXIT_FAILURE, "port %u: rte_eth_dev_adjust_nb_rx_tx_desc "
+                               "failed (res=%d)\n", BOND_PORT, retval);
+
        /* RX setup */
-       retval = rte_eth_rx_queue_setup(BOND_PORT, 0, RTE_RX_DESC_DEFAULT,
+       retval = rte_eth_rx_queue_setup(BOND_PORT, 0, nb_rxd,
                                        rte_eth_dev_socket_id(BOND_PORT), NULL,
                                        mbuf_pool);
        if (retval < 0)
@@ -244,7 +255,7 @@ bond_port_init(struct rte_mempool *mbuf_pool)
                                BOND_PORT, retval);
 
        /* TX setup */
-       retval = rte_eth_tx_queue_setup(BOND_PORT, 0, RTE_TX_DESC_DEFAULT,
+       retval = rte_eth_tx_queue_setup(BOND_PORT, 0, nb_txd,
                                rte_eth_dev_socket_id(BOND_PORT), NULL);
 
        if (retval < 0)
@@ -550,7 +561,7 @@ static void cmd_help_parsed(__attribute__((unused)) void *parsed_result,
 {
        cmdline_printf(cl,
                        "ALB - link bonding mode 6 example\n"
-                       "send IP        - sends one ARPrequest thru bonding for IP.\n"
+                       "send IP        - sends one ARPrequest through bonding for IP.\n"
                        "start          - starts listening ARPs.\n"
                        "stop           - stops lcore_main.\n"
                        "show           - shows some bond info: ex. active slaves etc.\n"