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/avp/avp_ethdev.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/avp/avp_ethdev.c b/drivers/net/avp/avp_ethdev.c index d536f764cf..ed6eb1cce8 100644 --- a/drivers/net/avp/avp_ethdev.c +++ b/drivers/net/avp/avp_ethdev.c @@ -49,14 +49,14 @@ static int avp_dev_promiscuous_disable(struct rte_eth_dev *dev); static int avp_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id, uint16_t nb_rx_desc, - unsigned int socket_id, + unsigned int numa_id, const struct rte_eth_rxconf *rx_conf, struct rte_mempool *pool); static int avp_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id, uint16_t nb_tx_desc, - unsigned int socket_id, + unsigned int numa_id, const struct rte_eth_txconf *tx_conf); static uint16_t avp_recv_scattered_pkts(void *rx_queue, @@ -1093,7 +1093,7 @@ static int avp_dev_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t rx_queue_id, uint16_t nb_rx_desc, - unsigned int socket_id, + unsigned int numa_id, const struct rte_eth_rxconf *rx_conf, struct rte_mempool *pool) { @@ -1131,8 +1131,8 @@ avp_dev_rx_queue_setup(struct rte_eth_dev *eth_dev, avp->guest_mbuf_size); /* allocate a queue object */ - rxq = rte_zmalloc_socket("ethdev RX queue", sizeof(struct avp_queue), - RTE_CACHE_LINE_SIZE, socket_id); + rxq = rte_zmalloc_numa("ethdev RX queue", sizeof(struct avp_queue), + RTE_CACHE_LINE_SIZE, numa_id); if (rxq == NULL) { PMD_DRV_LOG_LINE(ERR, "Failed to allocate new Rx queue object"); return -ENOMEM; @@ -1157,7 +1157,7 @@ static int avp_dev_tx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id, uint16_t nb_tx_desc, - unsigned int socket_id, + unsigned int numa_id, const struct rte_eth_txconf *tx_conf) { struct avp_dev *avp = AVP_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); @@ -1170,8 +1170,8 @@ avp_dev_tx_queue_setup(struct rte_eth_dev *eth_dev, } /* allocate a queue object */ - txq = rte_zmalloc_socket("ethdev TX queue", sizeof(struct avp_queue), - RTE_CACHE_LINE_SIZE, socket_id); + txq = rte_zmalloc_numa("ethdev TX queue", sizeof(struct avp_queue), + RTE_CACHE_LINE_SIZE, numa_id); if (txq == NULL) { PMD_DRV_LOG_LINE(ERR, "Failed to allocate new Tx queue object"); return -ENOMEM; -- 2.55.0
