net/sfc: support Rx interrupts for efx datapath

[dpdk.git] / drivers / net / szedata2 / rte_eth_szedata2.c

diff --git a/drivers/net/szedata2/rte_eth_szedata2.c b/drivers/net/szedata2/rte_eth_szedata2.c
index d105e50..c1ea6fc 100644 (file)
--- a/drivers/net/szedata2/rte_eth_szedata2.c
+++ b/drivers/net/szedata2/rte_eth_szedata2.c
@@ -105,7 +105,7 @@ struct szedata2_tx_queue {
 int szedata2_logtype_init;
 int szedata2_logtype_driver;
 
-static struct ether_addr eth_addr = {
+static struct rte_ether_addr eth_addr = {
        .addr_bytes = { 0x00, 0x11, 0x17, 0x00, 0x00, 0x00 }
 };
 
@@ -1093,7 +1093,6 @@ eth_stats_get(struct rte_eth_dev *dev,
                if (i < RTE_ETHDEV_QUEUE_STAT_CNTRS) {
                        stats->q_opackets[i] = txq->tx_pkts;
                        stats->q_obytes[i] = txq->tx_bytes;
-                       stats->q_errors[i] = txq->err_pkts;
                }
                tx_total += txq->tx_pkts;
                tx_total_bytes += txq->tx_bytes;
@@ -1332,7 +1331,7 @@ eth_tx_queue_setup(struct rte_eth_dev *dev,
 
 static int
 eth_mac_addr_set(struct rte_eth_dev *dev __rte_unused,
-               struct ether_addr *mac_addr __rte_unused)
+               struct rte_ether_addr *mac_addr __rte_unused)
 {
        return 0;
 }
@@ -1474,7 +1473,7 @@ rte_szedata2_eth_dev_init(struct rte_eth_dev *dev, struct port_info *pi)
        PMD_INIT_FUNC_TRACE();
 
        PMD_INIT_LOG(INFO, "Initializing eth_dev %s (driver %s)", data->name,
-                       dev->device->driver->name);
+                       RTE_STR(RTE_SZEDATA2_DRIVER_NAME));
 
        /* Fill internal private structure. */
        internals->dev = dev;
@@ -1514,7 +1513,7 @@ rte_szedata2_eth_dev_init(struct rte_eth_dev *dev, struct port_info *pi)
        eth_link_update(dev, 0);
 
        /* Allocate space for one mac address */
-       data->mac_addrs = rte_zmalloc(data->name, sizeof(struct ether_addr),
+       data->mac_addrs = rte_zmalloc(data->name, sizeof(struct rte_ether_addr),
                        RTE_CACHE_LINE_SIZE);
        if (data->mac_addrs == NULL) {
                PMD_INIT_LOG(ERR, "Could not alloc space for MAC address!");
@@ -1522,10 +1521,10 @@ rte_szedata2_eth_dev_init(struct rte_eth_dev *dev, struct port_info *pi)
                return -ENOMEM;
        }
 
-       ether_addr_copy(&eth_addr, data->mac_addrs);
+       rte_ether_addr_copy(&eth_addr, data->mac_addrs);
 
        PMD_INIT_LOG(INFO, "%s device %s successfully initialized",
-                       dev->device->driver->name, data->name);
+                       RTE_STR(RTE_SZEDATA2_DRIVER_NAME), data->name);
 
        return 0;
 }
@@ -1544,10 +1543,9 @@ rte_szedata2_eth_dev_uninit(struct rte_eth_dev *dev)
        PMD_INIT_FUNC_TRACE();
 
        free(internals->sze_dev_path);
-       rte_free(dev->data->mac_addrs);
 
        PMD_DRV_LOG(INFO, "%s device %s successfully uninitialized",
-                       dev->device->driver->name, dev->data->name);
+                       RTE_STR(RTE_SZEDATA2_DRIVER_NAME), dev->data->name);
 
        return 0;
 }
@@ -1841,6 +1839,8 @@ static int szedata2_eth_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
                        rte_free(list_entry);
                        return ret;
                }
+
+               rte_eth_dev_probing_finish(eth_devs[i]);
        }
 
        /*
@@ -1920,9 +1920,7 @@ RTE_PMD_REGISTER_PCI_TABLE(RTE_SZEDATA2_DRIVER_NAME, rte_szedata2_pci_id_table);
 RTE_PMD_REGISTER_KMOD_DEP(RTE_SZEDATA2_DRIVER_NAME,
        "* combo6core & combov3 & szedata2 & ( szedata2_cv3 | szedata2_cv3_fdt )");
 
-RTE_INIT(szedata2_init_log);
-static void
-szedata2_init_log(void)
+RTE_INIT(szedata2_init_log)
 {
        szedata2_logtype_init = rte_log_register("pmd.net.szedata2.init");
        if (szedata2_logtype_init >= 0)