examples/vhost_scsi: fix null-check for parameter

[dpdk.git] / examples / qos_sched / app_thread.c

diff --git a/examples/qos_sched/app_thread.c b/examples/qos_sched/app_thread.c
index 0c81a15..e14b275 100644 (file)
--- a/examples/qos_sched/app_thread.c
+++ b/examples/qos_sched/app_thread.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <stdint.h>
@@ -102,8 +73,11 @@ app_rx_thread(struct thread_conf **confs)
                        for(i = 0; i < nb_rx; i++) {
                                get_pkt_sched(rx_mbufs[i],
                                                &subport, &pipe, &traffic_class, &queue, &color);
-                               rte_sched_port_pkt_write(rx_mbufs[i], subport, pipe,
-                                               traffic_class, queue, (enum rte_meter_color) color);
+                               rte_sched_port_pkt_write(conf->sched_port,
+                                               rx_mbufs[i],
+                                               subport, pipe,
+                                               traffic_class, queue,
+                                               (enum rte_color) color);
                        }
 
                        if (unlikely(rte_ring_sp_enqueue_bulk(conf->rx_ring,
@@ -179,7 +153,7 @@ app_tx_thread(struct thread_conf **confs)
 
        while ((conf = confs[conf_idx])) {
                retval = rte_ring_sc_dequeue_bulk(conf->tx_ring, (void **)mbufs,
-                                       burst_conf.qos_dequeue);
+                                       burst_conf.qos_dequeue, NULL);
                if (likely(retval != 0)) {
                        app_send_packets(conf, mbufs, burst_conf.qos_dequeue);
 
@@ -218,7 +192,7 @@ app_worker_thread(struct thread_conf **confs)
 
                /* Read packet from the ring */
                nb_pkt = rte_ring_sc_dequeue_burst(conf->rx_ring, (void **)mbufs,
-                                       burst_conf.ring_burst);
+                                       burst_conf.ring_burst, NULL);
                if (likely(nb_pkt)) {
                        int nb_sent = rte_sched_port_enqueue(conf->sched_port, mbufs,
                                        nb_pkt);
@@ -254,7 +228,7 @@ app_mixed_thread(struct thread_conf **confs)
 
                /* Read packet from the ring */
                nb_pkt = rte_ring_sc_dequeue_burst(conf->rx_ring, (void **)mbufs,
-                                       burst_conf.ring_burst);
+                                       burst_conf.ring_burst, NULL);
                if (likely(nb_pkt)) {
                        int nb_sent = rte_sched_port_enqueue(conf->sched_port, mbufs,
                                        nb_pkt);