From f3f75f632ac2175b103801d5ad238d0971573761 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 16 Jun 2020 11:46:37 +0200 Subject: [PATCH] net/bonding: fix socket ID check [ upstream commit 46dac7d1115c66762aa78e308d5f1c401ee5e3a0 ] Caught by code review, rte_eth_dev_socket_id() returns -1 on error. The code should behave the same, but still, do not use LCORE_ID_ANY for something that is not a lcore id. Fixes: c15c5897340d ("net/bonding: avoid allocating mempool on unknown socket") Signed-off-by: David Marchand Acked-by: Chas Williams --- drivers/net/bonding/rte_eth_bond_8023ad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c index 0beea19c47..a66a027545 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c @@ -958,7 +958,7 @@ bond_mode_8023ad_activate_slave(struct rte_eth_dev *bond_dev, RTE_ASSERT(port->tx_ring == NULL); socket_id = rte_eth_dev_socket_id(slave_id); - if (socket_id == (int)LCORE_ID_ANY) + if (socket_id == -1) socket_id = rte_socket_id(); element_size = sizeof(struct slow_protocol_frame) +