import 15.2.0 Octopus source

[ceph.git] / ceph / src / seastar / dpdk / examples / qos_sched / cfg_file.c

diff --git a/ceph/src/seastar/dpdk/examples/qos_sched/cfg_file.c b/ceph/src/seastar/dpdk/examples/qos_sched/cfg_file.c
index 94a1a221354fc51da622d3d904c0547cf81ccb2e..76ffffc4b6973ac35cabaf7915d70d5edb9dc95f 100644 (file)
--- a/ceph/src/seastar/dpdk/examples/qos_sched/cfg_file.c
+++ b/ceph/src/seastar/dpdk/examples/qos_sched/cfg_file.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 <stdio.h>
@@ -93,7 +64,7 @@ cfg_load_port(struct rte_cfgfile *cfg, struct rte_sched_port_params *port_params
                        char *next;
                        int k;
                        /* for each packet colour (green, yellow, red) */
-                       for (k = 0; k < e_RTE_METER_COLORS; k++) {
+                       for (k = 0; k < RTE_COLORS; k++) {
                                port_params->red_params[j][k].min_th
                                        = (uint16_t)strtol(entry, &next, 10);
                                if (next == NULL)
@@ -109,7 +80,7 @@ cfg_load_port(struct rte_cfgfile *cfg, struct rte_sched_port_params *port_params
                        char *next;
                        int k;
                        /* for each packet colour (green, yellow, red) */
-                       for (k = 0; k < e_RTE_METER_COLORS; k++) {
+                       for (k = 0; k < RTE_COLORS; k++) {
                                port_params->red_params[j][k].max_th
                                        = (uint16_t)strtol(entry, &next, 10);
                                if (next == NULL)
@@ -125,7 +96,7 @@ cfg_load_port(struct rte_cfgfile *cfg, struct rte_sched_port_params *port_params
                        char *next;
                        int k;
                        /* for each packet colour (green, yellow, red) */
-                       for (k = 0; k < e_RTE_METER_COLORS; k++) {
+                       for (k = 0; k < RTE_COLORS; k++) {
                                port_params->red_params[j][k].maxp_inv
                                        = (uint8_t)strtol(entry, &next, 10);
 
@@ -142,7 +113,7 @@ cfg_load_port(struct rte_cfgfile *cfg, struct rte_sched_port_params *port_params
                        char *next;
                        int k;
                        /* for each packet colour (green, yellow, red) */
-                       for (k = 0; k < e_RTE_METER_COLORS; k++) {
+                       for (k = 0; k < RTE_COLORS; k++) {
                                port_params->red_params[j][k].wq_log2
                                        = (uint8_t)strtol(entry, &next, 10);
                                if (next == NULL)