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/nfb/nfb_ethdev.c | 2 +- drivers/net/nfb/nfb_rx.c | 8 ++++---- drivers/net/nfb/nfb_rx.h | 2 +- drivers/net/nfb/nfb_tx.c | 8 ++++---- drivers/net/nfb/nfb_tx.h | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/net/nfb/nfb_ethdev.c b/drivers/net/nfb/nfb_ethdev.c index ba7c849a4b..795abcd9ac 100644 --- a/drivers/net/nfb/nfb_ethdev.c +++ b/drivers/net/nfb/nfb_ethdev.c @@ -763,7 +763,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev, void *init_data) struct rte_ether_addr eth_addr_init; uint16_t max_rx_queues, max_tx_queues; - internals = rte_zmalloc_socket("nfb_internals", + internals = rte_zmalloc_numa("nfb_internals", sizeof(struct pmd_internals), RTE_CACHE_LINE_SIZE, dev->device->numa_node); if (internals == NULL) { diff --git a/drivers/net/nfb/nfb_rx.c b/drivers/net/nfb/nfb_rx.c index 5b8579e280..0d8a515a1f 100644 --- a/drivers/net/nfb/nfb_rx.c +++ b/drivers/net/nfb/nfb_rx.c @@ -56,7 +56,7 @@ int nfb_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id, uint16_t nb_rx_desc __rte_unused, - unsigned int socket_id, + unsigned int numa_id, const struct rte_eth_rxconf *rx_conf __rte_unused, struct rte_mempool *mb_pool) { @@ -70,11 +70,11 @@ nfb_eth_rx_queue_setup(struct rte_eth_dev *dev, if (rx_queue_id >= priv->max_rx_queues) return -EINVAL; - rxq = rte_zmalloc_socket("ndp rx queue", sizeof(struct ndp_rx_queue), - RTE_CACHE_LINE_SIZE, socket_id); + rxq = rte_zmalloc_numa("ndp rx queue", sizeof(struct ndp_rx_queue), + RTE_CACHE_LINE_SIZE, numa_id); if (rxq == NULL) { - NFB_LOG(ERR, "rte_zmalloc_socket() failed for rx queue id %" PRIu16, + NFB_LOG(ERR, "rte_zmalloc_numa() failed for rx queue id %u", rx_queue_id); return -ENOMEM; } diff --git a/drivers/net/nfb/nfb_rx.h b/drivers/net/nfb/nfb_rx.h index 831945c577..453245f6fe 100644 --- a/drivers/net/nfb/nfb_rx.h +++ b/drivers/net/nfb/nfb_rx.h @@ -87,7 +87,7 @@ int nfb_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id, uint16_t nb_rx_desc __rte_unused, - unsigned int socket_id, + unsigned int numa_id, const struct rte_eth_rxconf *rx_conf __rte_unused, struct rte_mempool *mb_pool); diff --git a/drivers/net/nfb/nfb_tx.c b/drivers/net/nfb/nfb_tx.c index 1a7dcc3d30..fb9791eab9 100644 --- a/drivers/net/nfb/nfb_tx.c +++ b/drivers/net/nfb/nfb_tx.c @@ -50,7 +50,7 @@ int nfb_eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id, uint16_t nb_tx_desc __rte_unused, - unsigned int socket_id, + unsigned int numa_id, const struct rte_eth_txconf *tx_conf __rte_unused) { struct pmd_internals *internals = dev->process_private; @@ -63,11 +63,11 @@ nfb_eth_tx_queue_setup(struct rte_eth_dev *dev, if (tx_queue_id >= priv->max_tx_queues) return -EINVAL; - txq = rte_zmalloc_socket("ndp tx queue", sizeof(struct ndp_tx_queue), - RTE_CACHE_LINE_SIZE, socket_id); + txq = rte_zmalloc_numa("ndp tx queue", sizeof(struct ndp_tx_queue), + RTE_CACHE_LINE_SIZE, numa_id); if (txq == NULL) { - NFB_LOG(ERR, "rte_zmalloc_socket() failed for tx queue id %" PRIu16, + NFB_LOG(ERR, "rte_zmalloc_numa() failed for tx queue id %u", tx_queue_id); return -ENOMEM; } diff --git a/drivers/net/nfb/nfb_tx.h b/drivers/net/nfb/nfb_tx.h index c253af1a86..0b6aad50e6 100644 --- a/drivers/net/nfb/nfb_tx.h +++ b/drivers/net/nfb/nfb_tx.h @@ -45,7 +45,7 @@ int nfb_eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id, uint16_t nb_tx_desc __rte_unused, - unsigned int socket_id, + unsigned int numa_id, const struct rte_eth_txconf *tx_conf __rte_unused); /** -- 2.55.0
