New upstream version 17.11-rc3

[deb_dpdk.git] / examples / qos_sched / init.c

diff --git a/examples/qos_sched/init.c b/examples/qos_sched/init.c
index a82cbd7..038f042 100644 (file)
--- a/examples/qos_sched/init.c
+++ b/examples/qos_sched/init.c
@@ -100,7 +100,7 @@ static const struct rte_eth_conf port_conf = {
 };
 
 static int
-app_init_port(uint8_t portid, struct rte_mempool *mp)
+app_init_port(uint16_t portid, struct rte_mempool *mp)
 {
        int ret;
        struct rte_eth_link link;
@@ -118,6 +118,7 @@ app_init_port(uint8_t portid, struct rte_mempool *mp)
        rx_conf.rx_thresh.wthresh = rx_thresh.wthresh;
        rx_conf.rx_free_thresh = 32;
        rx_conf.rx_drop_en = 0;
+       rx_conf.rx_deferred_start = 0;
 
        tx_conf.tx_thresh.pthresh = tx_thresh.pthresh;
        tx_conf.tx_thresh.hthresh = tx_thresh.hthresh;
@@ -125,21 +126,24 @@ app_init_port(uint8_t portid, struct rte_mempool *mp)
        tx_conf.tx_free_thresh = 0;
        tx_conf.tx_rs_thresh = 0;
        tx_conf.txq_flags = ETH_TXQ_FLAGS_NOMULTSEGS | ETH_TXQ_FLAGS_NOOFFLOADS;
+       tx_conf.tx_deferred_start = 0;
 
        /* init port */
-       RTE_LOG(INFO, APP, "Initializing port %"PRIu8"... ", portid);
+       RTE_LOG(INFO, APP, "Initializing port %"PRIu16"... ", portid);
        fflush(stdout);
        ret = rte_eth_dev_configure(portid, 1, 1, &port_conf);
        if (ret < 0)
-               rte_exit(EXIT_FAILURE, "Cannot configure device: "
-                               "err=%d, port=%"PRIu8"\n", ret, portid);
+               rte_exit(EXIT_FAILURE,
+                        "Cannot configure device: err=%d, port=%u\n",
+                        ret, portid);
 
        rx_size = ring_conf.rx_size;
        tx_size = ring_conf.tx_size;
        ret = rte_eth_dev_adjust_nb_rx_tx_desc(portid, &rx_size, &tx_size);
        if (ret < 0)
-               rte_exit(EXIT_FAILURE, "rte_eth_dev_adjust_nb_rx_tx_desc: "
-                               "err=%d, port=%"PRIu8"\n", ret, portid);
+               rte_exit(EXIT_FAILURE,
+                        "rte_eth_dev_adjust_nb_rx_tx_desc: err=%d,port=%u\n",
+                        ret, portid);
        ring_conf.rx_size = rx_size;
        ring_conf.tx_size = tx_size;
 
@@ -148,22 +152,25 @@ app_init_port(uint8_t portid, struct rte_mempool *mp)
        ret = rte_eth_rx_queue_setup(portid, 0, (uint16_t)ring_conf.rx_size,
                rte_eth_dev_socket_id(portid), &rx_conf, mp);
        if (ret < 0)
-               rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup: "
-                               "err=%d, port=%"PRIu8"\n", ret, portid);
+               rte_exit(EXIT_FAILURE,
+                        "rte_eth_tx_queue_setup: err=%d, port=%u\n",
+                        ret, portid);
 
        /* init one TX queue */
        fflush(stdout);
        ret = rte_eth_tx_queue_setup(portid, 0,
                (uint16_t)ring_conf.tx_size, rte_eth_dev_socket_id(portid), &tx_conf);
        if (ret < 0)
-               rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup: err=%d, "
-                               "port=%"PRIu8" queue=%d\n", ret, portid, 0);
+               rte_exit(EXIT_FAILURE,
+                        "rte_eth_tx_queue_setup: err=%d, port=%u queue=%d\n",
+                        ret, portid, 0);
 
        /* Start device */
        ret = rte_eth_dev_start(portid);
        if (ret < 0)
-               rte_exit(EXIT_FAILURE, "rte_pmd_port_start: "
-                               "err=%d, port=%"PRIu8"\n", ret, portid);
+               rte_exit(EXIT_FAILURE,
+                        "rte_pmd_port_start: err=%d, port=%u\n",
+                        ret, portid);
 
        printf("done: ");
 
@@ -256,7 +263,7 @@ app_init_sched_port(uint32_t portid, uint32_t socketid)
        uint32_t pipe, subport;
        int err;
 
-       rte_eth_link_get((uint8_t)portid, &link);
+       rte_eth_link_get(portid, &link);
 
        port_params.socket = socketid;
        port_params.rate = (uint64_t) link.link_speed * 1000 * 1000 / 8;