net/af_xdp: use libxdp if available

[dpdk.git] / app / test / test_link_bonding.c

diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c
index 3a46f94..dc6fc46 100644 (file)
--- a/app/test/test_link_bonding.c
+++ b/app/test/test_link_bonding.c
@@ -17,7 +17,7 @@
 #include <rte_common.h>
 #include <rte_debug.h>
 #include <rte_ethdev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_log.h>
 #include <rte_lcore.h>
 #include <rte_memory.h>
@@ -134,12 +134,11 @@ static uint16_t vlan_id = 0x100;
 
 static struct rte_eth_conf default_pmd_conf = {
        .rxmode = {
-               .mq_mode = ETH_MQ_RX_NONE,
+               .mq_mode = RTE_ETH_MQ_RX_NONE,
                .split_hdr_size = 0,
-               .max_rx_pkt_len = RTE_ETHER_MAX_LEN,
        },
        .txmode = {
-               .mq_mode = ETH_MQ_TX_NONE,
+               .mq_mode = RTE_ETH_MQ_TX_NONE,
        },
        .lpbk_mode = 0,
 };
@@ -613,7 +612,9 @@ test_stop_bonded_device(void)
        struct rte_eth_link link_status;
        int retval;
 
-       rte_eth_dev_stop(test_params->bonded_port_id);
+       TEST_ASSERT_SUCCESS(rte_eth_dev_stop(test_params->bonded_port_id),
+                       "Failed to stop bonded port %u",
+                       test_params->bonded_port_id);
 
        retval = rte_eth_link_get(test_params->bonded_port_id, &link_status);
        TEST_ASSERT(retval >= 0,
@@ -647,7 +648,10 @@ remove_slaves_and_stop_bonded_device(void)
                TEST_ASSERT_SUCCESS(test_remove_slave_from_bonded_device(),
                                "test_remove_slave_from_bonded_device failed");
 
-       rte_eth_dev_stop(test_params->bonded_port_id);
+       TEST_ASSERT_SUCCESS(rte_eth_dev_stop(test_params->bonded_port_id),
+                       "Failed to stop bonded port %u",
+                       test_params->bonded_port_id);
+
        rte_eth_stats_reset(test_params->bonded_port_id);
        rte_eth_bond_mac_address_reset(test_params->bonded_port_id);
 
@@ -755,7 +759,9 @@ test_set_primary_slave(void)
                                test_params->slave_port_ids[i]);
 
                /* stop/start bonded eth dev to apply new MAC */
-               rte_eth_dev_stop(test_params->bonded_port_id);
+               TEST_ASSERT_SUCCESS(rte_eth_dev_stop(test_params->bonded_port_id),
+                               "Failed to stop bonded port %u",
+                               test_params->bonded_port_id);
 
                TEST_ASSERT_SUCCESS(rte_eth_dev_start(test_params->bonded_port_id),
                                "Failed to start bonded port %d",
@@ -1024,7 +1030,10 @@ test_set_bonded_port_initialization_mac_assignment(void)
                        slave_port_ids[2]),
                        "failed to set primary port on bonded device.");
 
-       rte_eth_dev_stop(bonded_port_id);
+       TEST_ASSERT_SUCCESS(rte_eth_dev_stop(bonded_port_id),
+                       "Failed to stop bonded port %u",
+                       bonded_port_id);
+
        TEST_ASSERT_SUCCESS(rte_eth_dev_start(bonded_port_id),
                                "Failed to start bonded pmd eth device %d.",
                                bonded_port_id);
@@ -1063,7 +1072,9 @@ test_set_bonded_port_initialization_mac_assignment(void)
         *    b - remove slave ethdevs
         *    c - Verify slave ethdevs MACs are restored
         */
-       rte_eth_dev_stop(bonded_port_id);
+       TEST_ASSERT_SUCCESS(rte_eth_dev_stop(bonded_port_id),
+                       "Failed to stop bonded port %u",
+                       bonded_port_id);
 
        for (i = 0; i < BONDED_INIT_MAC_ASSIGNMENT_SLAVE_COUNT; i++) {
                TEST_ASSERT_SUCCESS(rte_eth_bond_slave_remove(bonded_port_id,
@@ -1769,7 +1780,9 @@ test_roundrobin_verify_mac_assignment(void)
 
        /* stop / start bonded device and verify that primary MAC address is
         * propagate to bonded device and slaves */
-       rte_eth_dev_stop(test_params->bonded_port_id);
+       TEST_ASSERT_SUCCESS(rte_eth_dev_stop(test_params->bonded_port_id),
+                       "Failed to stop bonded port %u",
+                       test_params->bonded_port_id);
 
        TEST_ASSERT_SUCCESS(rte_eth_dev_start(test_params->bonded_port_id),
                        "Failed to start bonded device");
@@ -2404,7 +2417,9 @@ test_activebackup_verify_mac_assignment(void)
        /* stop / start bonded device and verify that primary MAC address is
         * propagated to bonded device and slaves */
 
-       rte_eth_dev_stop(test_params->bonded_port_id);
+       TEST_ASSERT_SUCCESS(rte_eth_dev_stop(test_params->bonded_port_id),
+                       "Failed to stop bonded port %u",
+                       test_params->bonded_port_id);
 
        TEST_ASSERT_SUCCESS(rte_eth_dev_start(test_params->bonded_port_id),
                        "Failed to start device");
@@ -3025,7 +3040,7 @@ test_balance_tx_burst_slave_tx_fail(void)
        first_tx_fail_idx = TEST_BAL_SLAVE_TX_FAIL_BURST_SIZE_1 -
                        TEST_BAL_SLAVE_TX_FAIL_PACKETS_COUNT;
 
-       /* copy mbuf referneces for expected transmission failures */
+       /* copy mbuf references for expected transmission failures */
        for (i = 0; i < TEST_BAL_SLAVE_TX_FAIL_PACKETS_COUNT; i++)
                expected_fail_pkts[i] = pkts_burst_1[i + first_tx_fail_idx];
 
@@ -3335,7 +3350,9 @@ test_balance_verify_mac_assignment(void)
        /* stop / start bonded device and verify that primary MAC address is
         * propagated to bonded device and slaves */
 
-       rte_eth_dev_stop(test_params->bonded_port_id);
+       TEST_ASSERT_SUCCESS(rte_eth_dev_stop(test_params->bonded_port_id),
+                       "Failed to stop bonded port %u",
+                       test_params->bonded_port_id);
 
        TEST_ASSERT_SUCCESS(rte_eth_dev_start(test_params->bonded_port_id),
                        "Failed to start bonded device");
@@ -3932,7 +3949,9 @@ test_broadcast_verify_mac_assignment(void)
        /* stop / start bonded device and verify that primary MAC address is
         * propagated to bonded device and slaves */
 
-       rte_eth_dev_stop(test_params->bonded_port_id);
+       TEST_ASSERT_SUCCESS(rte_eth_dev_stop(test_params->bonded_port_id),
+                       "Failed to stop bonded port %u",
+                       test_params->bonded_port_id);
 
        TEST_ASSERT_SUCCESS(rte_eth_dev_start(test_params->bonded_port_id),
                        "Failed to start bonded device");
@@ -4472,7 +4491,9 @@ test_tlb_verify_mac_assignment(void)
        /* stop / start bonded device and verify that primary MAC address is
         * propagated to bonded device and slaves */
 
-       rte_eth_dev_stop(test_params->bonded_port_id);
+       TEST_ASSERT_SUCCESS(rte_eth_dev_stop(test_params->bonded_port_id),
+                       "Failed to stop bonded port %u",
+                       test_params->bonded_port_id);
 
        TEST_ASSERT_SUCCESS(rte_eth_dev_start(test_params->bonded_port_id),
                        "Failed to start device");