ethdev: rename DCB field in config structs

[dpdk.git] / examples / vmdq_dcb / main.c

diff --git a/examples/vmdq_dcb/main.c b/examples/vmdq_dcb/main.c
index 20726e5..b90ac28 100644 (file)
--- a/examples/vmdq_dcb/main.c
+++ b/examples/vmdq_dcb/main.c
@@ -48,7 +48,6 @@
 #include <rte_memory.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
 #include <rte_launch.h>
@@ -70,14 +69,11 @@
 #include <rte_mbuf.h>
 #include <rte_memcpy.h>
 
-#include "main.h"
-
 /* basic constants used in application */
 #define NUM_QUEUES 128
 
 #define NUM_MBUFS 64*1024
 #define MBUF_CACHE_SIZE 64
-#define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
 
 #define INVALID_PORT_ID 0xFF
 
@@ -111,7 +107,7 @@ static const struct rte_eth_conf vmdq_dcb_conf_default = {
                        .default_pool = 0,
                        .nb_pool_maps = 0,
                        .pool_map = {{0, 0},},
-                       .dcb_queue = {0},
+                       .dcb_tc = {0},
                },
        },
 };
@@ -148,7 +144,7 @@ get_eth_conf(struct rte_eth_conf *eth_conf, enum rte_eth_nb_pools num_pools)
                conf.pool_map[i].pools = 1 << (i % num_pools);
        }
        for (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES; i++){
-               conf.dcb_queue[i] = (uint8_t)(i % (NUM_QUEUES/num_pools));
+               conf.dcb_tc[i] = (uint8_t)(i % (NUM_QUEUES/num_pools));
        }
        (void)(rte_memcpy(eth_conf, &vmdq_dcb_conf_default, sizeof(*eth_conf)));
        (void)(rte_memcpy(&eth_conf->rx_adv_conf.vmdq_dcb_conf, &conf,
@@ -313,7 +309,6 @@ vmdq_parse_args(int argc, char **argv)
 }
 
 
-#ifndef RTE_EXEC_ENV_BAREMETAL
 /* When we receive a HUP signal, print out our stats */
 static void
 sighup_handler(int signum)
@@ -326,7 +321,6 @@ sighup_handler(int signum)
        }
        printf("\nFinished handling signal %d\n", signum);
 }
-#endif
 
 /*
  * Main thread that does the work, reading from INPUT_PORT
@@ -401,7 +395,7 @@ static unsigned check_ports_num(unsigned nb_ports)
 
 /* Main function, does initialisation and calls the per-lcore functions */
 int
-MAIN(int argc, char *argv[])
+main(int argc, char *argv[])
 {
        unsigned cores;
        struct rte_mempool *mbuf_pool;
@@ -411,9 +405,7 @@ MAIN(int argc, char *argv[])
        unsigned nb_ports, valid_num_ports;
        uint8_t portid;
 
-#ifndef RTE_EXEC_ENV_BAREMETAL
        signal(SIGHUP, sighup_handler);
-#endif
 
        /* init EAL */
        ret = rte_eal_init(argc, argv);
@@ -448,12 +440,8 @@ MAIN(int argc, char *argv[])
                rte_exit(EXIT_FAILURE, "Error with valid ports number is not even or less than 2\n");
        }
 
-       mbuf_pool = rte_mempool_create("MBUF_POOL", NUM_MBUFS * nb_ports,
-                                      MBUF_SIZE, MBUF_CACHE_SIZE,
-                                      sizeof(struct rte_pktmbuf_pool_private),
-                                      rte_pktmbuf_pool_init, NULL,
-                                      rte_pktmbuf_init, NULL,
-                                      rte_socket_id(), 0);
+       mbuf_pool = rte_pktmbuf_pool_create("MBUF_POOL", NUM_MBUFS * nb_ports,
+               MBUF_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
        if (mbuf_pool == NULL)
                rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n");