net: add rte prefix to ether structures

[dpdk.git] / drivers / net / mvneta / mvneta_ethdev.c

diff --git a/drivers/net/mvneta/mvneta_ethdev.c b/drivers/net/mvneta/mvneta_ethdev.c
index d004bfd..d539ba6 100644 (file)
--- a/drivers/net/mvneta/mvneta_ethdev.c
+++ b/drivers/net/mvneta/mvneta_ethdev.c
@@ -4,6 +4,7 @@
  * All rights reserved.
  */
 
+#include <rte_string_fns.h>
 #include <rte_ethdev_driver.h>
 #include <rte_kvargs.h>
 #include <rte_bus_vdev.h>
@@ -347,7 +348,7 @@ mvneta_dev_start(struct rte_eth_dev *dev)
        if (priv->ppio)
                return mvneta_dev_set_link_up(dev);
 
-       snprintf(match, sizeof(match), "%s", dev->data->name);
+       strlcpy(match, dev->data->name, sizeof(match));
        priv->ppio_params.match = match;
        priv->ppio_params.inqs_params.mtu = dev->data->mtu;
 
@@ -616,7 +617,7 @@ mvneta_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
  *   0 on success, negative error value otherwise.
  */
 static int
-mvneta_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac_addr,
+mvneta_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr,
                  uint32_t index, uint32_t vmdq __rte_unused)
 {
        struct mvneta_priv *priv = dev->data->dev_private;
@@ -649,7 +650,7 @@ mvneta_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac_addr,
  *   MAC address to register.
  */
 static int
-mvneta_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
+mvneta_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
 {
        struct mvneta_priv *priv = dev->data->dev_private;
        int ret;
@@ -695,23 +696,48 @@ mvneta_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 
        stats->ipackets += ppio_stats.rx_packets +
                        ppio_stats.rx_broadcast_packets +
-                       ppio_stats.rx_multicast_packets;
+                       ppio_stats.rx_multicast_packets -
+                       priv->prev_stats.ipackets;
        stats->opackets += ppio_stats.tx_packets +
                        ppio_stats.tx_broadcast_packets +
-                       ppio_stats.tx_multicast_packets;
-       stats->ibytes += ppio_stats.rx_bytes;
-       stats->obytes += ppio_stats.tx_bytes;
+                       ppio_stats.tx_multicast_packets -
+                       priv->prev_stats.opackets;
+       stats->ibytes += ppio_stats.rx_bytes - priv->prev_stats.ibytes;
+       stats->obytes += ppio_stats.tx_bytes - priv->prev_stats.obytes;
        stats->imissed += ppio_stats.rx_discard +
-                         ppio_stats.rx_overrun;
+                         ppio_stats.rx_overrun -
+                         priv->prev_stats.imissed;
 
        stats->ierrors = ppio_stats.rx_packets_err +
                        ppio_stats.rx_errors +
-                       ppio_stats.rx_crc_error;
-       stats->oerrors = ppio_stats.tx_errors;
+                       ppio_stats.rx_crc_error -
+                       priv->prev_stats.ierrors;
+       stats->oerrors = ppio_stats.tx_errors - priv->prev_stats.oerrors;
 
        return 0;
 }
 
+/**
+ * DPDK callback to clear device statistics.
+ *
+ * @param dev
+ *   Pointer to Ethernet device structure.
+ */
+static void
+mvneta_stats_reset(struct rte_eth_dev *dev)
+{
+       struct mvneta_priv *priv = dev->data->dev_private;
+       unsigned int ret;
+
+       if (!priv->ppio)
+               return;
+
+       ret = mvneta_stats_get(dev, &priv->prev_stats);
+       if (unlikely(ret))
+               RTE_LOG(ERR, PMD, "Failed to reset port statistics");
+}
+
+
 static const struct eth_dev_ops mvneta_ops = {
        .dev_configure = mvneta_dev_configure,
        .dev_start = mvneta_dev_start,
@@ -727,6 +753,7 @@ static const struct eth_dev_ops mvneta_ops = {
        .mac_addr_set = mvneta_mac_addr_set,
        .mtu_set = mvneta_mtu_set,
        .stats_get = mvneta_stats_get,
+       .stats_reset = mvneta_stats_reset,
        .dev_infos_get = mvneta_dev_infos_get,
        .dev_supported_ptypes_get = mvneta_dev_supported_ptypes_get,
        .rxq_info_get = mvneta_rxq_info_get,
@@ -761,8 +788,9 @@ mvneta_eth_dev_create(struct rte_vdev_device *vdev, const char *name)
        priv = rte_zmalloc_socket(name, sizeof(*priv), 0, rte_socket_id());
        if (!priv) {
                ret = -ENOMEM;
-               goto out_free_dev;
+               goto out_free;
        }
+       eth_dev->data->dev_private = priv;
 
        eth_dev->data->mac_addrs =
                rte_zmalloc("mac_addrs",
@@ -770,20 +798,19 @@ mvneta_eth_dev_create(struct rte_vdev_device *vdev, const char *name)
        if (!eth_dev->data->mac_addrs) {
                MVNETA_LOG(ERR, "Failed to allocate space for eth addrs");
                ret = -ENOMEM;
-               goto out_free_priv;
+               goto out_free;
        }
 
        memset(&req, 0, sizeof(req));
        strcpy(req.ifr_name, name);
        ret = ioctl(fd, SIOCGIFHWADDR, &req);
        if (ret)
-               goto out_free_mac;
+               goto out_free;
 
        memcpy(eth_dev->data->mac_addrs[0].addr_bytes,
               req.ifr_addr.sa_data, ETHER_ADDR_LEN);
 
        eth_dev->data->kdrv = RTE_KDRV_NONE;
-       eth_dev->data->dev_private = priv;
        eth_dev->device = &vdev->device;
        eth_dev->rx_pkt_burst = mvneta_rx_pkt_burst;
        mvneta_set_tx_function(eth_dev);
@@ -791,11 +818,7 @@ mvneta_eth_dev_create(struct rte_vdev_device *vdev, const char *name)
 
        rte_eth_dev_probing_finish(eth_dev);
        return 0;
-out_free_mac:
-       rte_free(eth_dev->data->mac_addrs);
-out_free_priv:
-       rte_free(priv);
-out_free_dev:
+out_free:
        rte_eth_dev_release_port(eth_dev);
 
        return ret;
@@ -810,8 +833,6 @@ out_free_dev:
 static void
 mvneta_eth_dev_destroy(struct rte_eth_dev *eth_dev)
 {
-       rte_free(eth_dev->data->dev_private);
-       rte_free(eth_dev->data->mac_addrs);
        rte_eth_dev_release_port(eth_dev);
 }