net/iavf: fix QFI fields of GTPU UL/DL for flow director

[dpdk.git] / drivers / net / kni / rte_eth_kni.c

diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c
index be747ad..871d11c 100644 (file)
--- a/drivers/net/kni/rte_eth_kni.c
+++ b/drivers/net/kni/rte_eth_kni.c
@@ -7,8 +7,8 @@
 #include <unistd.h>
 
 #include <rte_string_fns.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_kni.h>
 #include <rte_kvargs.h>
 #include <rte_malloc.h>
@@ -68,7 +68,7 @@ static const struct rte_eth_link pmd_link = {
 };
 static int is_kni_initialized;
 
-RTE_LOG_REGISTER(eth_kni_logtype, pmd.net.kni, NOTICE);
+RTE_LOG_REGISTER_DEFAULT(eth_kni_logtype, NOTICE);
 
 #define PMD_LOG(level, fmt, args...) \
        rte_log(RTE_LOG_ ## level, eth_kni_logtype, \
@@ -177,7 +177,7 @@ eth_kni_dev_start(struct rte_eth_dev *dev)
        return 0;
 }
 
-static void
+static int
 eth_kni_dev_stop(struct rte_eth_dev *dev)
 {
        struct pmd_internals *internals = dev->data->dev_private;
@@ -196,6 +196,9 @@ eth_kni_dev_stop(struct rte_eth_dev *dev)
        }
 
        dev->data->dev_link.link_status = 0;
+       dev->data->dev_started = 0;
+
+       return 0;
 }
 
 static int
@@ -207,7 +210,10 @@ eth_kni_close(struct rte_eth_dev *eth_dev)
        if (rte_eal_process_type() != RTE_PROC_PRIMARY)
                return 0;
 
-       eth_kni_dev_stop(eth_dev);
+       ret = eth_kni_dev_stop(eth_dev);
+       if (ret)
+               PMD_LOG(WARNING, "Not able to stop kni for %s",
+                       eth_dev->data->name);
 
        /* mac_addrs must not be freed alone because part of dev_private */
        eth_dev->data->mac_addrs = NULL;
@@ -218,7 +224,7 @@ eth_kni_close(struct rte_eth_dev *eth_dev)
                PMD_LOG(WARNING, "Not able to release kni for %s",
                        eth_dev->data->name);
 
-       return 0;
+       return ret;
 }
 
 static int
@@ -389,6 +395,7 @@ eth_kni_create(struct rte_vdev_device *vdev,
        data->mac_addrs = &internals->eth_addr;
        data->promiscuous = 1;
        data->all_multicast = 1;
+       data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
 
        rte_eth_random_addr(internals->eth_addr.addr_bytes);
 
@@ -402,8 +409,13 @@ eth_kni_create(struct rte_vdev_device *vdev,
 static int
 kni_init(void)
 {
-       if (is_kni_initialized == 0)
-               rte_kni_init(MAX_KNI_PORTS);
+       int ret;
+
+       if (is_kni_initialized == 0) {
+               ret = rte_kni_init(MAX_KNI_PORTS);
+               if (ret < 0)
+                       return ret;
+       }
 
        is_kni_initialized++;
 
@@ -485,6 +497,7 @@ eth_kni_remove(struct rte_vdev_device *vdev)
 {
        struct rte_eth_dev *eth_dev;
        const char *name;
+       int ret;
 
        name = rte_vdev_device_name(vdev);
        PMD_LOG(INFO, "Un-Initializing eth_kni for %s", name);
@@ -493,7 +506,9 @@ eth_kni_remove(struct rte_vdev_device *vdev)
        eth_dev = rte_eth_dev_allocated(name);
        if (eth_dev != NULL) {
                if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
-                       eth_kni_dev_stop(eth_dev);
+                       ret = eth_kni_dev_stop(eth_dev);
+                       if (ret != 0)
+                               return ret;
                        return rte_eth_dev_release_port(eth_dev);
                }
                eth_kni_close(eth_dev);