net/i40e: fix request queue in VF

[dpdk.git] / drivers / net / ring / rte_eth_ring.c

diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index 979993f..eb347bc 100644 (file)
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -51,7 +51,7 @@ struct pmd_internals {
        struct ring_queue rx_ring_queues[RTE_PMD_RING_MAX_RX_RINGS];
        struct ring_queue tx_ring_queues[RTE_PMD_RING_MAX_TX_RINGS];
 
-       struct ether_addr address;
+       struct rte_ether_addr address;
        enum dev_action action;
 };
 
@@ -184,9 +184,8 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
        for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS &&
                        i < dev->data->nb_tx_queues; i++) {
                stats->q_opackets[i] = internal->tx_ring_queues[i].tx_pkts.cnt;
-               stats->q_errors[i] = internal->tx_ring_queues[i].err_pkts.cnt;
                tx_total += stats->q_opackets[i];
-               tx_err_total += stats->q_errors[i];
+               tx_err_total += internal->tx_ring_queues[i].err_pkts.cnt;
        }
 
        stats->ipackets = rx_total;
@@ -218,7 +217,7 @@ eth_mac_addr_remove(struct rte_eth_dev *dev __rte_unused,
 
 static int
 eth_mac_addr_add(struct rte_eth_dev *dev __rte_unused,
-       struct ether_addr *mac_addr __rte_unused,
+       struct rte_ether_addr *mac_addr __rte_unused,
        uint32_t index __rte_unused,
        uint32_t vmdq __rte_unused)
 {
@@ -249,8 +248,6 @@ static const struct eth_dev_ops ops = {
        .mac_addr_add = eth_mac_addr_add,
 };
 
-static struct rte_vdev_driver pmd_ring_drv;
-
 static int
 do_eth_dev_ring_create(const char *name,
                struct rte_ring * const rx_queues[],
@@ -396,7 +393,11 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
                return -1;
        }
 
-       rte_eth_dev_get_port_by_name(ring_name, &port_id);
+       ret = rte_eth_dev_get_port_by_name(ring_name, &port_id);
+       if (ret) {
+               rte_errno = ENODEV;
+               return -1;
+       }
 
        return port_id;
 }