drivers/net: do not use private ethdev data

[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 13f328e..7d89a32 100644 (file)
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -103,10 +103,10 @@ eth_null_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
                return 0;
 
        packet_size = h->internals->packet_size;
+       if (rte_pktmbuf_alloc_bulk(h->mb_pool, bufs, nb_bufs) != 0)
+               return 0;
+
        for (i = 0; i < nb_bufs; i++) {
-               bufs[i] = rte_pktmbuf_alloc(h->mb_pool);
-               if (!bufs[i])
-                       break;
                bufs[i]->data_len = (uint16_t)packet_size;
                bufs[i]->pkt_len = packet_size;
                bufs[i]->port = h->internals->port_id;
@@ -128,10 +128,10 @@ eth_null_copy_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
                return 0;
 
        packet_size = h->internals->packet_size;
+       if (rte_pktmbuf_alloc_bulk(h->mb_pool, bufs, nb_bufs) != 0)
+               return 0;
+
        for (i = 0; i < nb_bufs; i++) {
-               bufs[i] = rte_pktmbuf_alloc(h->mb_pool);
-               if (!bufs[i])
-                       break;
                rte_memcpy(rte_pktmbuf_mtod(bufs[i], void *), h->dummy_packet,
                                        packet_size);
                bufs[i]->data_len = (uint16_t)packet_size;
@@ -459,10 +459,11 @@ eth_rss_hash_conf_get(struct rte_eth_dev *dev,
        return 0;
 }
 
-static void
+static int
 eth_mac_address_set(__rte_unused struct rte_eth_dev *dev,
                    __rte_unused struct ether_addr *addr)
 {
+       return 0;
 }
 
 static const struct eth_dev_ops ops = {
@@ -494,7 +495,7 @@ eth_dev_null_create(struct rte_vdev_device *dev,
 {
        const unsigned nb_rx_queues = 1;
        const unsigned nb_tx_queues = 1;
-       struct rte_eth_dev_data *data = NULL;
+       struct rte_eth_dev_data *data;
        struct pmd_internals *internals = NULL;
        struct rte_eth_dev *eth_dev = NULL;
 
@@ -511,19 +512,10 @@ eth_dev_null_create(struct rte_vdev_device *dev,
        RTE_LOG(INFO, PMD, "Creating null ethdev on numa socket %u\n",
                dev->device.numa_node);
 
-       /* now do all data allocation - for eth_dev structure, dummy pci driver
-        * and internal (private) data
-        */
-       data = rte_zmalloc_socket(rte_vdev_device_name(dev), sizeof(*data), 0,
-               dev->device.numa_node);
-       if (!data)
-               return -ENOMEM;
-
        eth_dev = rte_eth_vdev_allocate(dev, sizeof(*internals));
-       if (!eth_dev) {
-               rte_free(data);
+       if (!eth_dev)
                return -ENOMEM;
-       }
+
        /* now put it all together
         * - store queue data in internals,
         * - store numa_node info in ethdev data
@@ -544,13 +536,12 @@ eth_dev_null_create(struct rte_vdev_device *dev,
 
        rte_memcpy(internals->rss_key, default_rss_key, 40);
 
-       rte_memcpy(data, eth_dev->data, sizeof(*data));
+       data = eth_dev->data;
        data->nb_rx_queues = (uint16_t)nb_rx_queues;
        data->nb_tx_queues = (uint16_t)nb_tx_queues;
        data->dev_link = pmd_link;
        data->mac_addrs = &internals->eth_addr;
 
-       eth_dev->data = data;
        eth_dev->dev_ops = &ops;
 
        /* finally assign rx and tx ops */
@@ -668,7 +659,6 @@ rte_pmd_null_remove(struct rte_vdev_device *dev)
                return -1;
 
        rte_free(eth_dev->data->dev_private);
-       rte_free(eth_dev->data);
 
        rte_eth_dev_release_port(eth_dev);