New upstream version 17.11-rc3

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

diff --git a/examples/vmdq_dcb/main.c b/examples/vmdq_dcb/main.c
index 35ffffa..9dad2b8 100644 (file)
--- a/examples/vmdq_dcb/main.c
+++ b/examples/vmdq_dcb/main.c
@@ -47,9 +47,7 @@
 #include <rte_log.h>
 #include <rte_memory.h>
 #include <rte_memcpy.h>
-#include <rte_memzone.h>
 #include <rte_eal.h>
-#include <rte_per_lcore.h>
 #include <rte_launch.h>
 #include <rte_atomic.h>
 #include <rte_cycles.h>
@@ -58,15 +56,12 @@
 #include <rte_per_lcore.h>
 #include <rte_branch_prediction.h>
 #include <rte_interrupts.h>
-#include <rte_pci.h>
 #include <rte_random.h>
 #include <rte_debug.h>
 #include <rte_ether.h>
 #include <rte_ethdev.h>
-#include <rte_log.h>
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
-#include <rte_memcpy.h>
 
 /* basic constants used in application */
 #define MAX_QUEUES 1024
@@ -90,7 +85,7 @@
 
 /* mask of enabled ports */
 static uint32_t enabled_port_mask;
-static uint8_t ports[RTE_MAX_ETHPORTS];
+static uint16_t ports[RTE_MAX_ETHPORTS];
 static unsigned num_ports;
 
 /* number of pools (if user does not specify any, 32 by default */
@@ -223,12 +218,12 @@ get_eth_conf(struct rte_eth_conf *eth_conf)
  * coming from the mbuf_pool passed as parameter
  */
 static inline int
-port_init(uint8_t port, struct rte_mempool *mbuf_pool)
+port_init(uint16_t port, struct rte_mempool *mbuf_pool)
 {
        struct rte_eth_dev_info dev_info;
        struct rte_eth_conf port_conf = {0};
-       const uint16_t rxRingSize = RTE_TEST_RX_DESC_DEFAULT;
-       const uint16_t txRingSize = RTE_TEST_TX_DESC_DEFAULT;
+       uint16_t rxRingSize = RTE_TEST_RX_DESC_DEFAULT;
+       uint16_t txRingSize = RTE_TEST_TX_DESC_DEFAULT;
        int retval;
        uint16_t q;
        uint16_t queues_per_pool;
@@ -299,6 +294,17 @@ port_init(uint8_t port, struct rte_mempool *mbuf_pool)
        if (retval != 0)
                return retval;
 
+       retval = rte_eth_dev_adjust_nb_rx_tx_desc(port, &rxRingSize,
+                               &txRingSize);
+       if (retval != 0)
+               return retval;
+       if (RTE_MAX(rxRingSize, txRingSize) >
+           RTE_MAX(RTE_TEST_RX_DESC_DEFAULT, RTE_TEST_TX_DESC_DEFAULT)) {
+               printf("Mbuf pool has an insufficient size for port %u.\n",
+                       port);
+               return -1;
+       }
+
        for (q = 0; q < num_queues; q++) {
                retval = rte_eth_rx_queue_setup(port, q, rxRingSize,
                                        rte_eth_dev_socket_id(port),
@@ -638,7 +644,7 @@ main(int argc, char *argv[])
        uintptr_t i;
        int ret;
        unsigned nb_ports, valid_num_ports;
-       uint8_t portid;
+       uint16_t portid;
 
        signal(SIGHUP, sighup_handler);