i40e: fix build without Rx bulk alloc

[dpdk.git] / drivers / net / null / rte_eth_null.c

diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index 64e9000..1c354ad 100644 (file)
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -69,10 +69,6 @@ struct null_queue {
 struct pmd_internals {
        unsigned packet_size;
        unsigned packet_copy;
-       unsigned numa_node;
-
-       unsigned nb_rx_queues;
-       unsigned nb_tx_queues;
 
        struct null_queue rx_null_queues[RTE_MAX_QUEUES_PER_PORT];
        struct null_queue tx_null_queues[RTE_MAX_QUEUES_PER_PORT];
@@ -192,13 +188,8 @@ eth_null_copy_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
 }
 
 static int
-eth_dev_configure(struct rte_eth_dev *dev) {
-       struct pmd_internals *internals;
-
-       internals = dev->data->dev_private;
-       internals->nb_rx_queues = dev->data->nb_rx_queues;
-       internals->nb_tx_queues = dev->data->nb_tx_queues;
-
+eth_dev_configure(struct rte_eth_dev *dev __rte_unused)
+{
        return 0;
 }
 
@@ -237,7 +228,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
 
        internals = dev->data->dev_private;
 
-       if (rx_queue_id >= internals->nb_rx_queues)
+       if (rx_queue_id >= dev->data->nb_rx_queues)
                return -ENODEV;
 
        packet_size = internals->packet_size;
@@ -246,7 +237,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
        dev->data->rx_queues[rx_queue_id] =
                &internals->rx_null_queues[rx_queue_id];
        dummy_packet = rte_zmalloc_socket(NULL,
-                       packet_size, 0, internals->numa_node);
+                       packet_size, 0, dev->data->numa_node);
        if (dummy_packet == NULL)
                return -ENOMEM;
 
@@ -271,7 +262,7 @@ eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
 
        internals = dev->data->dev_private;
 
-       if (tx_queue_id >= internals->nb_tx_queues)
+       if (tx_queue_id >= dev->data->nb_tx_queues)
                return -ENODEV;
 
        packet_size = internals->packet_size;
@@ -279,7 +270,7 @@ eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
        dev->data->tx_queues[tx_queue_id] =
                &internals->tx_null_queues[tx_queue_id];
        dummy_packet = rte_zmalloc_socket(NULL,
-                       packet_size, 0, internals->numa_node);
+                       packet_size, 0, dev->data->numa_node);
        if (dummy_packet == NULL)
                return -ENOMEM;
 
@@ -323,7 +314,7 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_stats)
 
        internal = dev->data->dev_private;
        num_stats = RTE_MIN((unsigned)RTE_ETHDEV_QUEUE_STAT_CNTRS,
-                       RTE_MIN(internal->nb_rx_queues,
+                       RTE_MIN(dev->data->nb_rx_queues,
                                RTE_DIM(internal->rx_null_queues)));
        for (i = 0; i < num_stats; i++) {
                igb_stats->q_ipackets[i] =
@@ -332,7 +323,7 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_stats)
        }
 
        num_stats = RTE_MIN((unsigned)RTE_ETHDEV_QUEUE_STAT_CNTRS,
-                       RTE_MIN(internal->nb_tx_queues,
+                       RTE_MIN(dev->data->nb_tx_queues,
                                RTE_DIM(internal->tx_null_queues)));
        for (i = 0; i < num_stats; i++) {
                igb_stats->q_opackets[i] =
@@ -366,13 +357,6 @@ eth_stats_reset(struct rte_eth_dev *dev)
        }
 }
 
-static struct eth_driver rte_null_pmd = {
-       .pci_drv = {
-               .name = "rte_null_pmd",
-               .drv_flags = RTE_PCI_DRV_DETACHABLE,
-       },
-};
-
 static void
 eth_queue_release(void *q)
 {
@@ -501,7 +485,6 @@ eth_dev_null_create(const char *name,
        const unsigned nb_rx_queues = 1;
        const unsigned nb_tx_queues = 1;
        struct rte_eth_dev_data *data = NULL;
-       struct rte_pci_device *pci_dev = NULL;
        struct pmd_internals *internals = NULL;
        struct rte_eth_dev *eth_dev = NULL;
 
@@ -525,10 +508,6 @@ eth_dev_null_create(const char *name,
        if (data == NULL)
                goto error;
 
-       pci_dev = rte_zmalloc_socket(name, sizeof(*pci_dev), 0, numa_node);
-       if (pci_dev == NULL)
-               goto error;
-
        internals = rte_zmalloc_socket(name, sizeof(*internals), 0, numa_node);
        if (internals == NULL)
                goto error;
@@ -540,27 +519,21 @@ eth_dev_null_create(const char *name,
 
        /* now put it all together
         * - store queue data in internals,
-        * - store numa_node info in pci_driver
-        * - point eth_dev_data to internals and pci_driver
+        * - store numa_node info in ethdev data
+        * - point eth_dev_data to internals
         * - and point eth_dev structure to new eth_dev_data structure
         */
        /* NOTE: we'll replace the data element, of originally allocated eth_dev
         * so the nulls are local per-process */
 
-       internals->nb_rx_queues = nb_rx_queues;
-       internals->nb_tx_queues = nb_tx_queues;
        internals->packet_size = packet_size;
        internals->packet_copy = packet_copy;
-       internals->numa_node = numa_node;
 
        internals->flow_type_rss_offloads =  ETH_RSS_PROTO_MASK;
        internals->reta_size = RTE_DIM(internals->reta_conf) * RTE_RETA_GROUP_SIZE;
 
        rte_memcpy(internals->rss_key, default_rss_key, 40);
 
-       pci_dev->numa_node = numa_node;
-       pci_dev->driver = &rte_null_pmd.pci_drv;
-
        data->dev_private = internals;
        data->port_id = eth_dev->data->port_id;
        data->nb_rx_queues = (uint16_t)nb_rx_queues;
@@ -571,10 +544,15 @@ eth_dev_null_create(const char *name,
 
        eth_dev->data = data;
        eth_dev->dev_ops = &ops;
-       eth_dev->pci_dev = pci_dev;
-       eth_dev->driver = &rte_null_pmd;
+
        TAILQ_INIT(&eth_dev->link_intr_cbs);
 
+       eth_dev->driver = NULL;
+       data->dev_flags = RTE_ETH_DEV_DETACHABLE;
+       data->kdrv = RTE_KDRV_NONE;
+       data->drv_name = drivername;
+       data->numa_node = numa_node;
+
        /* finally assign rx and tx ops */
        if (packet_copy) {
                eth_dev->rx_pkt_burst = eth_null_copy_rx;
@@ -588,7 +566,6 @@ eth_dev_null_create(const char *name,
 
 error:
        rte_free(data);
-       rte_free(pci_dev);
        rte_free(internals);
 
        return -1;
@@ -691,14 +668,13 @@ rte_pmd_null_devuninit(const char *name)
        RTE_LOG(INFO, PMD, "Closing null ethdev on numa socket %u\n",
                        rte_socket_id());
 
-       /* reserve an ethdev entry */
+       /* find the ethdev entry */
        eth_dev = rte_eth_dev_allocated(name);
        if (eth_dev == NULL)
                return -1;
 
        rte_free(eth_dev->data->dev_private);
        rte_free(eth_dev->data);
-       rte_free(eth_dev->pci_dev);
 
        rte_eth_dev_release_port(eth_dev);