examples/distributor: fix build with icc 2015
[dpdk.git] / examples / distributor / main.c
index 78fe3e9..4e74f8f 100644 (file)
@@ -47,7 +47,6 @@
 #define RX_RING_SIZE 256
 #define TX_RING_SIZE 512
 #define NUM_MBUFS ((64*1024)-1)
-#define MBUF_DATA_SIZE (2048 + RTE_PKTMBUF_HEADROOM)
 #define MBUF_CACHE_SIZE 250
 #define BURST_SIZE 32
 #define RTE_RING_SZ 1024
@@ -58,7 +57,7 @@
 #ifdef DEBUG
 #define LOG_LEVEL RTE_LOG_DEBUG
 #define LOG_DEBUG(log_type, fmt, args...) do { \
-       RTE_LOG(DEBUG, log_type, fmt, ##args)           \
+       RTE_LOG(DEBUG, log_type, fmt, ##args);          \
 } while (0)
 #else
 #define LOG_LEVEL RTE_LOG_INFO
@@ -336,13 +335,13 @@ lcore_tx(struct rte_ring *in_r)
 
                        /* for traffic we receive, queue it up for transmit */
                        uint16_t i;
-                       _mm_prefetch(bufs[0], 0);
-                       _mm_prefetch(bufs[1], 0);
-                       _mm_prefetch(bufs[2], 0);
+                       _mm_prefetch((void *)bufs[0], 0);
+                       _mm_prefetch((void *)bufs[1], 0);
+                       _mm_prefetch((void *)bufs[2], 0);
                        for (i = 0; i < nb_rx; i++) {
                                struct output_buffer *outbuf;
                                uint8_t outp;
-                               _mm_prefetch(bufs[i + 3], 0);
+                               _mm_prefetch((void *)bufs[i + 3], 0);
                                /*
                                 * workers should update in_port to hold the
                                 * output port value
@@ -529,8 +528,8 @@ main(int argc, char *argv[])
                                "when using a single port\n");
 
        mbuf_pool = rte_pktmbuf_pool_create("MBUF_POOL",
-               NUM_MBUFS * nb_ports, MBUF_CACHE_SIZE, 0, MBUF_DATA_SIZE,
-               rte_socket_id());
+               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;