net/ice: enable switch filter

[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 89f4473..9e0c6bd 100644 (file)
--- a/drivers/net/kni/rte_eth_kni.c
+++ b/drivers/net/kni/rte_eth_kni.c
@@ -20,7 +20,7 @@
 #define MAX_KNI_PORTS 8
 
 #define KNI_ETHER_MTU(mbuf_size)       \
-       ((mbuf_size) - ETHER_HDR_LEN) /**< Ethernet MTU. */
+       ((mbuf_size) - RTE_ETHER_HDR_LEN) /**< Ethernet MTU. */
 
 #define ETH_KNI_NO_REQUEST_THREAD_ARG  "no_request_thread"
 static const char * const valid_arguments[] = {
@@ -54,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];
@@ -290,10 +290,9 @@ eth_kni_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
                q = data->tx_queues[i];
                stats->q_opackets[i] = q->tx.pkts;
                stats->q_obytes[i] = q->tx.bytes;
-               stats->q_errors[i] = q->tx.err_pkts;
                tx_packets_total += stats->q_opackets[i];
                tx_bytes_total += stats->q_obytes[i];
-               tx_packets_err_total += stats->q_errors[i];
+               tx_packets_err_total += q->tx.err_pkts;
        }
 
        stats->ipackets = rx_packets_total;
@@ -363,7 +362,7 @@ eth_kni_create(struct rte_vdev_device *vdev,
        data->dev_link = pmd_link;
        data->mac_addrs = &internals->eth_addr;
 
-       eth_random_addr(internals->eth_addr.addr_bytes);
+       rte_eth_random_addr(internals->eth_addr.addr_bytes);
 
        eth_dev->dev_ops = &eth_kni_ops;
 
@@ -459,6 +458,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);
@@ -477,7 +477,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);