Imported Upstream version 17.05

[deb_dpdk.git] / test / test / test_link_bonding_rssconf.c

diff --git a/app/test/test_link_bonding_rssconf.c b/test/test/test_link_bonding_rssconf.c
similarity index 96%
rename from app/test/test_link_bonding_rssconf.c
rename to test/test/test_link_bonding_rssconf.c
index 34f1c16..d28db7d 100644 (file)
--- a/app/test/test_link_bonding_rssconf.c
+++ b/test/test/test_link_bonding_rssconf.c
@@ -52,7 +52,6 @@
 #include <rte_string_fns.h>
 #include <rte_errno.h>
 #include <rte_eth_bond.h>
-#include <rte_eth_null.h>
 
 #include "test.h"
 
@@ -67,7 +66,7 @@
 #define SLAVE_RXTX_QUEUE_FMT      ("rssconf_slave%d_q%d")
 
 #define NUM_MBUFS 8191
-#define MBUF_SIZE (1600 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
+#define MBUF_SIZE (1600 + RTE_PKTMBUF_HEADROOM)
 #define MBUF_CACHE_SIZE 250
 #define BURST_SIZE 32
 
@@ -116,7 +115,7 @@ static struct rte_eth_conf default_pmd_conf = {
                .hw_ip_checksum = 0, /**< IP checksum offload enabled */
                .hw_vlan_filter = 0, /**< VLAN filtering disabled */
                .jumbo_frame    = 0, /**< Jumbo Frame Support disabled */
-               .hw_strip_crc   = 0, /**< CRC stripped by hardware */
+               .hw_strip_crc   = 1, /**< CRC stripped by hardware */
        },
        .txmode = {
                .mq_mode = ETH_MQ_TX_NONE,
@@ -133,7 +132,7 @@ static struct rte_eth_conf rss_pmd_conf = {
                .hw_ip_checksum = 0, /**< IP checksum offload enabled */
                .hw_vlan_filter = 0, /**< VLAN filtering disabled */
                .jumbo_frame    = 0, /**< Jumbo Frame Support disabled */
-               .hw_strip_crc   = 0, /**< CRC stripped by hardware */
+               .hw_strip_crc   = 1, /**< CRC stripped by hardware */
        },
        .txmode = {
                .mq_mode = ETH_MQ_TX_NONE,
@@ -536,13 +535,12 @@ test_setup(void)
 
        if (test_params.mbuf_pool == NULL) {
 
-               test_params.mbuf_pool = rte_mempool_create("RSS_MBUF_POOL", NUM_MBUFS *
-                               SLAVE_COUNT, MBUF_SIZE, MBUF_CACHE_SIZE,
-                               sizeof(struct rte_pktmbuf_pool_private), rte_pktmbuf_pool_init,
-                               NULL, rte_pktmbuf_init, NULL, rte_socket_id(), 0);
+               test_params.mbuf_pool = rte_pktmbuf_pool_create(
+                       "RSS_MBUF_POOL", NUM_MBUFS * SLAVE_COUNT,
+                       MBUF_CACHE_SIZE, 0, MBUF_SIZE, rte_socket_id());
 
                TEST_ASSERT(test_params.mbuf_pool != NULL,
-                               "rte_mempool_create failed\n");
+                               "rte_pktmbuf_pool_create failed\n");
        }
 
        /* Create / initialize ring eth devs. */
@@ -552,7 +550,8 @@ test_setup(void)
                port_id = rte_eth_dev_count();
                snprintf(name, sizeof(name), SLAVE_DEV_NAME_FMT, port_id);
 
-               retval = eth_dev_null_create(name, 0, 64, 0);
+               retval = rte_vdev_init(name,
+                       "driver=net_null,size=64,copy=0");
                TEST_ASSERT_SUCCESS(retval, "Failed to create null device '%s'\n",
                                name);