ethdev: increase port id range

[dpdk.git] / examples / multi_process / client_server_mp / mp_server / main.c

diff --git a/examples/multi_process/client_server_mp/mp_server/main.c b/examples/multi_process/client_server_mp/mp_server/main.c
index 1eaf761..121383f 100644 (file)
--- a/examples/multi_process/client_server_mp/mp_server/main.c
+++ b/examples/multi_process/client_server_mp/mp_server/main.c
@@ -38,7 +38,6 @@
 #include <stdint.h>
 #include <stdarg.h>
 #include <inttypes.h>
-#include <inttypes.h>
 #include <sys/queue.h>
 #include <errno.h>
 #include <netinet/ip.h>
@@ -46,9 +45,7 @@
 #include <rte_common.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
-#include <rte_byteorder.h>
 #include <rte_launch.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
@@ -66,13 +63,11 @@
 #include <rte_ethdev.h>
 #include <rte_byteorder.h>
 #include <rte_malloc.h>
-#include <rte_fbk_hash.h>
 #include <rte_string_fns.h>
 
 #include "common.h"
 #include "args.h"
 #include "init.h"
-#include "main.h"
 
 /*
  * When doing reads from the NIC or the client queues,
@@ -93,7 +88,7 @@ struct client_rx_buf {
 static struct client_rx_buf *cl_rx_buf;
 
 static const char *
-get_printable_mac_addr(uint8_t port)
+get_printable_mac_addr(uint16_t port)
 {
        static const char err_address[] = "00:00:00:00:00:00";
        static char addresses[RTE_MAX_ETHPORTS][sizeof(err_address)];
@@ -103,7 +98,7 @@ get_printable_mac_addr(uint8_t port)
        if (unlikely(addresses[port][0]=='\0')){
                struct ether_addr mac;
                rte_eth_macaddr_get(port, &mac);
-               rte_snprintf(addresses[port], sizeof(addresses[port]),
+               snprintf(addresses[port], sizeof(addresses[port]),
                                "%02x:%02x:%02x:%02x:%02x:%02x\n",
                                mac.addr_bytes[0], mac.addr_bytes[1], mac.addr_bytes[2],
                                mac.addr_bytes[3], mac.addr_bytes[4], mac.addr_bytes[5]);
@@ -230,7 +225,7 @@ flush_rx_queue(uint16_t client)
 
        cl = &clients[client];
        if (rte_ring_enqueue_bulk(cl->rx_q, (void **)cl_rx_buf[client].buffer,
-                       cl_rx_buf[client].count) != 0){
+                       cl_rx_buf[client].count, NULL) == 0){
                for (j = 0; j < cl_rx_buf[client].count; j++)
                        rte_pktmbuf_free(cl_rx_buf[client].buffer[j]);
                cl->stats.rx_drop += cl_rx_buf[client].count;
@@ -301,7 +296,7 @@ do_packet_forwarding(void)
 }
 
 int
-MAIN(int argc, char *argv[])
+main(int argc, char *argv[])
 {
        /* initialise the system */
        if (init(argc, argv) < 0 )