Imported Upstream version 17.05

[deb_dpdk.git] / examples / ip_pipeline / init.c

diff --git a/examples/ip_pipeline/init.c b/examples/ip_pipeline/init.c
index d46bd36..be148fc 100644 (file)
--- a/examples/ip_pipeline/init.c
+++ b/examples/ip_pipeline/init.c
@@ -69,7 +69,8 @@ static void
 app_init_core_map(struct app_params *app)
 {
        APP_LOG(app, HIGH, "Initializing CPU core map ...");
-       app->core_map = cpu_core_map_init(4, 32, 4, 0);
+       app->core_map = cpu_core_map_init(RTE_MAX_NUMA_NODES, RTE_MAX_LCORE,
+                               4, 0);
 
        if (app->core_map == NULL)
                rte_panic("Cannot create CPU core map\n");
@@ -329,16 +330,14 @@ app_init_mempool(struct app_params *app)
                struct app_mempool_params *p = &app->mempool_params[i];
 
                APP_LOG(app, HIGH, "Initializing %s ...", p->name);
-               app->mempool[i] = rte_mempool_create(
-                               p->name,
-                               p->pool_size,
-                               p->buffer_size,
-                               p->cache_size,
-                               sizeof(struct rte_pktmbuf_pool_private),
-                               rte_pktmbuf_pool_init, NULL,
-                               rte_pktmbuf_init, NULL,
-                               p->cpu_socket_id,
-                               0);
+               app->mempool[i] = rte_pktmbuf_pool_create(
+                       p->name,
+                       p->pool_size,
+                       p->cache_size,
+                       0, /* priv_size */
+                       p->buffer_size -
+                               sizeof(struct rte_mbuf), /* mbuf data size */
+                       p->cpu_socket_id);
 
                if (app->mempool[i] == NULL)
                        rte_panic("%s init error\n", p->name);
@@ -718,7 +717,8 @@ app_link_up_internal(struct app_params *app, struct app_link_params *cp)
 
        /* PMD link up */
        status = rte_eth_dev_set_link_up(cp->pmd_id);
-       if (status < 0)
+       /* Do not panic if PMD does not provide link up functionality */
+       if (status < 0 && status != -ENOTSUP)
                rte_panic("%s (%" PRIu32 "): PMD set link up error %"
                        PRId32 "\n", cp->name, cp->pmd_id, status);
 
@@ -734,7 +734,8 @@ app_link_down_internal(struct app_params *app, struct app_link_params *cp)
 
        /* PMD link down */
        status = rte_eth_dev_set_link_down(cp->pmd_id);
-       if (status < 0)
+       /* Do not panic if PMD does not provide link down functionality */
+       if (status < 0 && status != -ENOTSUP)
                rte_panic("%s (%" PRIu32 "): PMD set link down error %"
                        PRId32 "\n", cp->name, cp->pmd_id, status);