apps: fix default mbuf size

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

diff --git a/examples/distributor/main.c b/examples/distributor/main.c
index 52266f0..ae3e7b3 100644 (file)
--- a/examples/distributor/main.c
+++ b/examples/distributor/main.c
@@ -44,12 +44,9 @@
 #include <rte_debug.h>
 #include <rte_distributor.h>
 
-#include "main.h"
-
 #define RX_RING_SIZE 256
 #define TX_RING_SIZE 512
 #define NUM_MBUFS ((64*1024)-1)
-#define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
 #define MBUF_CACHE_SIZE 250
 #define BURST_SIZE 32
 #define RTE_RING_SZ 1024
@@ -96,11 +93,10 @@ static const struct rte_eth_conf port_conf_default = {
                .mq_mode = ETH_MQ_TX_NONE,
        },
        .rx_adv_conf = {
-                       .rss_conf = {
-                               .rss_hf = ETH_RSS_IPV4 | ETH_RSS_IPV6 |
-                                       ETH_RSS_IPV4_TCP | ETH_RSS_IPV4_UDP |
-                                       ETH_RSS_IPV6_TCP | ETH_RSS_IPV6_UDP,
-                       }
+               .rss_conf = {
+                       .rss_hf = ETH_RSS_IP | ETH_RSS_UDP |
+                               ETH_RSS_TCP | ETH_RSS_SCTP,
+               }
        },
 };
 
@@ -492,7 +488,7 @@ parse_args(int argc, char **argv)
 
 /* Main function, does initialization and calls the per-lcore functions */
 int
-MAIN(int argc, char *argv[])
+main(int argc, char *argv[])
 {
        struct rte_mempool *mbuf_pool;
        struct rte_distributor *d;
@@ -531,12 +527,9 @@ MAIN(int argc, char *argv[])
                rte_exit(EXIT_FAILURE, "Error: number of ports must be even, except "
                                "when using a single port\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");
        nb_ports_available = nb_ports;