From 31d4891cfe9451fecce1e26e51153d608c76a4f8 Mon Sep 17 00:00:00 2001 From: Peter Morrow Date: Tue, 5 Dec 2023 10:07:10 +0000 Subject: dpdk: never override devname if set via config Even if the device name is specified in the startup config it may be appended to if the device is a switch domain member. This leads to unexpected device naming if an explicit device name was requested. Type: fix Change-Id: Ib56b4ac41c17008db55dc69497721e3cb7d540c1 Signed-off-by: Peter Morrow --- src/plugins/dpdk/device/init.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index d88dad49ad5..b76455ba60d 100644 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -360,12 +360,13 @@ dpdk_lib_init (dpdk_main_t * dm) pci_dev->addr.devid, pci_dev->addr.function); else xd->name = format (xd->name, "%u", port_id); - } - /* Handle representor devices that share the same PCI ID */ - if ((di.switch_info.domain_id != RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID) && - (di.switch_info.port_id != (uint16_t) -1)) - xd->name = format (xd->name, "/%d", di.switch_info.port_id); + /* Handle representor devices that share the same PCI ID */ + if ((di.switch_info.domain_id != + RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID) && + (di.switch_info.port_id != (uint16_t) -1)) + xd->name = format (xd->name, "/%d", di.switch_info.port_id); + } /* number of RX and TX queues */ if (devconf->num_tx_queues > 0) -- cgit 1.2.3-korg