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/bus/auxiliary/auxiliary_common.c | 2 +- drivers/bus/auxiliary/linux/auxiliary.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/bus/auxiliary/auxiliary_common.c b/drivers/bus/auxiliary/auxiliary_common.c index 016d124f0b..622e03345e 100644 --- a/drivers/bus/auxiliary/auxiliary_common.c +++ b/drivers/bus/auxiliary/auxiliary_common.c @@ -84,7 +84,7 @@ auxiliary_probe_device(struct rte_driver *drv, struct rte_device *dev) if (!auxiliary_dev_exists(dev->name)) return -ENOENT; - if (aux_dev->device.numa_node < 0 && rte_socket_count() > 1) + if (aux_dev->device.numa_node < 0 && rte_numa_count() > 1) AUXILIARY_LOG(INFO, "Device %s is not NUMA-aware", aux_dev->name); iova_mode = rte_eal_iova_mode(); diff --git a/drivers/bus/auxiliary/linux/auxiliary.c b/drivers/bus/auxiliary/linux/auxiliary.c index 3a2dca2865..475db6caf8 100644 --- a/drivers/bus/auxiliary/linux/auxiliary.c +++ b/drivers/bus/auxiliary/linux/auxiliary.c @@ -43,7 +43,7 @@ auxiliary_scan_one(const char *dirname, const char *name) eal_parse_sysfs_value(filename, &tmp) == 0) dev->device.numa_node = tmp; else - dev->device.numa_node = SOCKET_ID_ANY; + dev->device.numa_node = RTE_NUMA_ID_ANY; auxiliary_on_scan(dev); -- 2.55.0
