From: Chengwen Feng <[email protected]> Rename socket_id parameters, internal structure fields, variables and comments to the NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <[email protected]> --- drivers/net/softnic/rte_eth_softnic.c | 6 +++--- drivers/net/softnic/rte_eth_softnic_thread.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/softnic/rte_eth_softnic.c b/drivers/net/softnic/rte_eth_softnic.c index 868e194509..857c70da4a 100644 --- a/drivers/net/softnic/rte_eth_softnic.c +++ b/drivers/net/softnic/rte_eth_softnic.c @@ -79,7 +79,7 @@ static int pmd_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id, uint16_t nb_rx_desc, - unsigned int socket_id __rte_unused, + unsigned int numa_id __rte_unused, const struct rte_eth_rxconf *rx_conf __rte_unused, struct rte_mempool *mb_pool __rte_unused) { @@ -107,7 +107,7 @@ static int pmd_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id, uint16_t nb_tx_desc, - unsigned int socket_id __rte_unused, + unsigned int numa_id __rte_unused, const struct rte_eth_txconf *tx_conf __rte_unused) { char name[NAME_SIZE]; @@ -254,7 +254,7 @@ pmd_init(struct pmd_params *params) struct pmd_internals *p; int status; - p = rte_zmalloc_socket(params->name, + p = rte_zmalloc_numa(params->name, sizeof(struct pmd_internals), 0, params->cpu_id); diff --git a/drivers/net/softnic/rte_eth_softnic_thread.c b/drivers/net/softnic/rte_eth_softnic_thread.c index a6d47c8b33..f45b63f481 100644 --- a/drivers/net/softnic/rte_eth_softnic_thread.c +++ b/drivers/net/softnic/rte_eth_softnic_thread.c @@ -41,7 +41,7 @@ softnic_thread_init(struct pmd_internals *softnic) struct rte_ring *msgq_req, *msgq_rsp; struct softnic_thread *t = &softnic->thread[i]; struct softnic_thread_data *t_data = &softnic->thread_data[i]; - uint32_t cpu_id = rte_lcore_to_socket_id(i); + uint32_t cpu_id = rte_lcore_to_numa_id(i); /* MSGQs */ snprintf(ring_name, sizeof(ring_name), "%s-TH%u-REQ", -- 2.55.0
