git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/bnxt: fix flow destroy
[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
e72e499
..
e53823a
100644
(file)
--- a/
drivers/net/ring/rte_eth_ring.c
+++ b/
drivers/net/ring/rte_eth_ring.c
@@
-4,7
+4,7
@@
#include "rte_eth_ring.h"
#include <rte_mbuf.h>
#include "rte_eth_ring.h"
#include <rte_mbuf.h>
-#include <rte_ethdev.h>
+#include <rte_ethdev
_driver
.h>
#include <rte_malloc.h>
#include <rte_memcpy.h>
#include <rte_string_fns.h>
#include <rte_malloc.h>
#include <rte_memcpy.h>
#include <rte_string_fns.h>
@@
-60,7
+60,7
@@
static struct rte_eth_link pmd_link = {
.link_speed = ETH_SPEED_NUM_10G,
.link_duplex = ETH_LINK_FULL_DUPLEX,
.link_status = ETH_LINK_DOWN,
.link_speed = ETH_SPEED_NUM_10G,
.link_duplex = ETH_LINK_FULL_DUPLEX,
.link_status = ETH_LINK_DOWN,
- .link_autoneg = ETH_LINK_
SPEED_
AUTONEG
+ .link_autoneg = ETH_LINK_AUTONEG
};
static uint16_t
};
static uint16_t
@@
-259,15
+259,6
@@
do_eth_dev_ring_create(const char *name,
RTE_LOG(INFO, PMD, "Creating rings-backed ethdev on numa socket %u\n",
numa_node);
RTE_LOG(INFO, PMD, "Creating rings-backed ethdev on numa socket %u\n",
numa_node);
- /* now do all data allocation - for eth_dev structure, dummy pci driver
- * and internal (private) data
- */
- data = rte_zmalloc_socket(name, sizeof(*data), 0, numa_node);
- if (data == NULL) {
- rte_errno = ENOMEM;
- goto error;
- }
-
rx_queues_local = rte_zmalloc_socket(name,
sizeof(void *) * nb_rx_queues, 0, numa_node);
if (rx_queues_local == NULL) {
rx_queues_local = rte_zmalloc_socket(name,
sizeof(void *) * nb_rx_queues, 0, numa_node);
if (rx_queues_local == NULL) {
@@
-301,10
+292,8
@@
do_eth_dev_ring_create(const char *name,
* - point eth_dev_data to internals
* - and point eth_dev structure to new eth_dev_data structure
*/
* - 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 rings are local per-process */
-
rte_memcpy(data, eth_dev->data, sizeof(*data))
;
+
data = eth_dev->data
;
data->rx_queues = rx_queues_local;
data->tx_queues = tx_queues_local;
data->rx_queues = rx_queues_local;
data->tx_queues = tx_queues_local;
@@
-326,7
+315,6
@@
do_eth_dev_ring_create(const char *name,
data->dev_link = pmd_link;
data->mac_addrs = &internals->address;
data->dev_link = pmd_link;
data->mac_addrs = &internals->address;
- eth_dev->data = data;
eth_dev->dev_ops = &ops;
data->kdrv = RTE_KDRV_NONE;
data->numa_node = numa_node;
eth_dev->dev_ops = &ops;
data->kdrv = RTE_KDRV_NONE;
data->numa_node = numa_node;
@@
-342,7
+330,6
@@
do_eth_dev_ring_create(const char *name,
error:
rte_free(rx_queues_local);
rte_free(tx_queues_local);
error:
rte_free(rx_queues_local);
rte_free(tx_queues_local);
- rte_free(data);
rte_free(internals);
return -1;
rte_free(internals);
return -1;
@@
-675,8
+662,6
@@
rte_pmd_ring_remove(struct rte_vdev_device *dev)
rte_free(eth_dev->data->tx_queues);
rte_free(eth_dev->data->dev_private);
rte_free(eth_dev->data->tx_queues);
rte_free(eth_dev->data->dev_private);
- rte_free(eth_dev->data);
-
rte_eth_dev_release_port(eth_dev);
return 0;
}
rte_eth_dev_release_port(eth_dev);
return 0;
}