net: add rte prefix to ether structures

[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 5e02224..180cfd6 100644 (file)
--- a/drivers/net/kni/rte_eth_kni.c
+++ b/drivers/net/kni/rte_eth_kni.c
@@ -6,6 +6,7 @@
 #include <pthread.h>
 #include <unistd.h>
 
+#include <rte_string_fns.h>
 #include <rte_ethdev_driver.h>
 #include <rte_ethdev_vdev.h>
 #include <rte_kni.h>
@@ -53,7 +54,7 @@ struct pmd_internals {
        int stop_thread;
        int no_request_thread;
 
-       struct ether_addr eth_addr;
+       struct rte_ether_addr eth_addr;
 
        struct pmd_queue rx_queues[KNI_MAX_QUEUE_PER_PORT];
        struct pmd_queue tx_queues[KNI_MAX_QUEUE_PER_PORT];
@@ -126,7 +127,7 @@ eth_kni_start(struct rte_eth_dev *dev)
        const char *name = dev->device->name + 4; /* remove net_ */
 
        mb_pool = internals->rx_queues[0].mb_pool;
-       snprintf(conf.name, RTE_KNI_NAMESIZE, "%s", name);
+       strlcpy(conf.name, name, RTE_KNI_NAMESIZE);
        conf.force_bind = 0;
        conf.group_id = port_id;
        conf.mbuf_size =
@@ -458,6 +459,7 @@ eth_kni_remove(struct rte_vdev_device *vdev)
        struct rte_eth_dev *eth_dev;
        struct pmd_internals *internals;
        const char *name;
+       int ret;
 
        name = rte_vdev_device_name(vdev);
        PMD_LOG(INFO, "Un-Initializing eth_kni for %s", name);
@@ -476,7 +478,9 @@ eth_kni_remove(struct rte_vdev_device *vdev)
        eth_kni_dev_stop(eth_dev);
 
        internals = eth_dev->data->dev_private;
-       rte_kni_release(internals->kni);
+       ret = rte_kni_release(internals->kni);
+       if (ret)
+               PMD_LOG(WARNING, "Not able to release kni for %s", name);
 
        rte_eth_dev_release_port(eth_dev);