net/avf: align dynamic log names with standard

[dpdk.git] / test / test / test_kni.c

diff --git a/test/test/test_kni.c b/test/test/test_kni.c
index db17fdf..539d231 100644 (file)
--- a/test/test/test_kni.c
+++ b/test/test/test_kni.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>
@@ -42,6 +13,7 @@
 #include <rte_string_fns.h>
 #include <rte_mempool.h>
 #include <rte_ethdev.h>
+#include <rte_bus_pci.h>
 #include <rte_cycles.h>
 #include <rte_kni.h>
 
@@ -132,7 +104,7 @@ test_kni_lookup_mempool(void)
 }
 /* Callback for request of changing MTU */
 static int
-kni_change_mtu(uint8_t port_id, unsigned new_mtu)
+kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
 {
        printf("Change MTU of port %d to %u\n", port_id, new_mtu);
        kni_pkt_mtu = new_mtu;
@@ -362,7 +334,7 @@ test_kni_register_handler_mp(void)
 }
 
 static int
-test_kni_processing(uint8_t port_id, struct rte_mempool *mp)
+test_kni_processing(uint16_t port_id, struct rte_mempool *mp)
 {
        int ret = 0;
        unsigned i;
@@ -387,7 +359,7 @@ test_kni_processing(uint8_t port_id, struct rte_mempool *mp)
        conf.core_id = 1;
        conf.force_bind = 1;
        conf.mbuf_size = MAX_PACKET_SZ;
-       conf.group_id = (uint16_t)port_id;
+       conf.group_id = port_id;
 
        ops = kni_ops;
        ops.port_id = port_id;
@@ -472,7 +444,7 @@ static int
 test_kni(void)
 {
        int ret = -1;
-       uint8_t nb_ports, port_id;
+       uint16_t nb_ports, port_id;
        struct rte_kni *kni;
        struct rte_mempool *mp;
        struct rte_kni_conf conf;
@@ -538,7 +510,7 @@ test_kni(void)
        rte_eth_dev_info_get(port_id, &info);
        conf.addr = info.pci_dev->addr;
        conf.id = info.pci_dev->id;
-       conf.group_id = (uint16_t)port_id;
+       conf.group_id = port_id;
        conf.mbuf_size = MAX_PACKET_SZ;
 
        ops = kni_ops;
@@ -567,7 +539,7 @@ test_kni(void)
        rte_eth_dev_info_get(port_id, &info);
        conf.addr = info.pci_dev->addr;
        conf.id = info.pci_dev->id;
-       conf.group_id = (uint16_t)port_id;
+       conf.group_id = port_id;
        conf.mbuf_size = MAX_PACKET_SZ;
 
        ops = kni_ops;