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/dpaa2/dpaa2_ethdev.c | 6 +++--- drivers/net/dpaa2/dpaa2_tm.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index b3a725c0ea..12ddfe90b1 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -933,7 +933,7 @@ static int dpaa2_dev_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, struct rte_mempool *mb_pool) { @@ -1142,7 +1142,7 @@ static int dpaa2_dev_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) { struct dpaa2_dev_priv *priv = dev->data->dev_private; @@ -3874,7 +3874,7 @@ static int dpaa2_tx_sg_pool_init(void) DPAA2_POOL_SIZE, DPAA2_POOL_CACHE_SIZE, 0, DPAA2_MAX_SGS * sizeof(struct qbman_sge), - rte_socket_id()); + rte_numa_id()); if (!dpaa2_tx_sg_pool) { DPAA2_PMD_ERR("SG pool creation failed"); return -ENOMEM; diff --git a/drivers/net/dpaa2/dpaa2_tm.c b/drivers/net/dpaa2/dpaa2_tm.c index 3057f4d031..d26b27f915 100644 --- a/drivers/net/dpaa2/dpaa2_tm.c +++ b/drivers/net/dpaa2/dpaa2_tm.c @@ -322,8 +322,8 @@ dpaa2_shaper_profile_add(struct rte_eth_dev *dev, uint32_t shaper_profile_id, RTE_TM_ERROR_TYPE_SHAPER_PROFILE_ID, NULL, "Profile id already exists\n"); - profile = rte_zmalloc_socket(NULL, sizeof(*profile), 0, - rte_socket_id()); + profile = rte_zmalloc_numa(NULL, sizeof(*profile), 0, + rte_numa_id()); if (!profile) return -rte_tm_error_set(error, ENOMEM, RTE_TM_ERROR_TYPE_UNSPECIFIED, @@ -486,7 +486,7 @@ dpaa2_node_add(struct rte_eth_dev *dev, uint32_t node_id, RTE_TM_ERROR_TYPE_NODE_ID, NULL, "Node id already exists\n"); - node = rte_zmalloc_socket(NULL, sizeof(*node), 0, rte_socket_id()); + node = rte_zmalloc_numa(NULL, sizeof(*node), 0, rte_numa_id()); if (!node) return -rte_tm_error_set(error, ENOMEM, RTE_TM_ERROR_TYPE_UNSPECIFIED, -- 2.55.0
