From 2eee509c7c7a3e4b564161b163ea0003f029dd57 Mon Sep 17 00:00:00 2001 From: Radu Nicolau Date: Tue, 13 Nov 2018 16:46:04 +0000 Subject: [PATCH] examples/bond: fix initialization order Queue setup will fail if called before adding slaves. Fixes: 7a0665940fa8 ("net/bonding: inherit descriptor limits from slaves") Cc: stable@dpdk.org Signed-off-by: Radu Nicolau Acked-by: Chas Williams --- examples/bond/main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/bond/main.c b/examples/bond/main.c index b282e68baa..65f3c39806 100644 --- a/examples/bond/main.c +++ b/examples/bond/main.c @@ -243,6 +243,13 @@ bond_port_init(struct rte_mempool *mbuf_pool) rte_exit(EXIT_FAILURE, "port %u: rte_eth_dev_adjust_nb_rx_tx_desc " "failed (res=%d)\n", BOND_PORT, retval); + for (i = 0; i < slaves_count; i++) { + if (rte_eth_bond_slave_add(BOND_PORT, slaves[i]) == -1) + rte_exit(-1, "Oooops! adding slave (%u) to bond (%u) failed!\n", + slaves[i], BOND_PORT); + + } + /* RX setup */ rxq_conf = dev_info.default_rxconf; rxq_conf.offloads = local_port_conf.rxmode.offloads; @@ -263,13 +270,6 @@ bond_port_init(struct rte_mempool *mbuf_pool) rte_exit(retval, "port %u: TX queue 0 setup failed (res=%d)", BOND_PORT, retval); - for (i = 0; i < slaves_count; i++) { - if (rte_eth_bond_slave_add(BOND_PORT, slaves[i]) == -1) - rte_exit(-1, "Oooops! adding slave (%u) to bond (%u) failed!\n", - slaves[i], BOND_PORT); - - } - retval = rte_eth_dev_start(BOND_PORT); if (retval < 0) rte_exit(retval, "Start port %d failed (res=%d)", BOND_PORT, retval); -- 2.20.1