X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Ftap%2Frte_eth_tap.c;h=b18efd8b70e7ce3858c0d092fa78592e7a1a8638;hb=5f19dee604ed5760d819743d1d364493ead2aae6;hp=915d9373f8c4bd675aa5a1a59343c6d90bad63a1;hpb=cdb068f031c6b0a4ecea6f62190e17ecfdbeb23d;p=dpdk.git diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 915d9373f8..b18efd8b70 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -1386,12 +1386,6 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name, RTE_LOG(DEBUG, PMD, "%s device on numa %u\n", tuntap_name, rte_socket_id()); - data = rte_zmalloc_socket(tap_name, sizeof(*data), 0, numa_node); - if (!data) { - RTE_LOG(ERR, PMD, "%s Failed to allocate data\n", tuntap_name); - goto error_exit_nodev; - } - dev = rte_eth_vdev_allocate(vdev, sizeof(*pmd)); if (!dev) { RTE_LOG(ERR, PMD, "%s Unable to allocate device struct\n", @@ -1412,7 +1406,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name, } /* Setup some default values */ - rte_memcpy(data, dev->data, sizeof(*data)); + data = dev->data; data->dev_private = pmd; data->dev_flags = RTE_ETH_DEV_INTR_LSC; data->numa_node = numa_node; @@ -1423,7 +1417,6 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name, data->nb_rx_queues = 0; data->nb_tx_queues = 0; - dev->data = data; dev->dev_ops = &ops; dev->rx_pkt_burst = pmd_rx_burst; dev->tx_pkt_burst = pmd_tx_burst; @@ -1574,7 +1567,6 @@ error_exit_nodev: RTE_LOG(ERR, PMD, "%s Unable to initialize %s\n", tuntap_name, rte_vdev_device_name(vdev)); - rte_free(data); return -EINVAL; } @@ -1828,7 +1820,6 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev) close(internals->ioctl_sock); rte_free(eth_dev->data->dev_private); - rte_free(eth_dev->data); rte_eth_dev_release_port(eth_dev);