From fb6eb1e69c499feb5f36193b906c910553835cc6 Mon Sep 17 00:00:00 2001 From: Kiran Kumar Date: Wed, 23 May 2018 14:41:21 +0530 Subject: [PATCH] net/bonding: fix MAC address reset Currently when resetting bond mac address, we are getting the persisted mac address from slave info considering primary port as index. But we need to compare the port id from slave info with the primary port to get the primary slave index and get the persisted mac address. Without this fix, persisted mac addr will be zero and rte_eth_dev_default_mac_addr_set will fail. Fixes: a45b288ef21a ("bond: support link status polling") Cc: stable@dpdk.org Signed-off-by: Kiran Kumar --- drivers/net/bonding/rte_eth_bond_api.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c index d558df8b9d..d1a110ec98 100644 --- a/drivers/net/bonding/rte_eth_bond_api.c +++ b/drivers/net/bonding/rte_eth_bond_api.c @@ -716,9 +716,21 @@ rte_eth_bond_mac_address_reset(uint16_t bonded_port_id) internals->user_defined_mac = 0; if (internals->slave_count > 0) { + int slave_port; + /* Get the primary slave location based on the primary port + * number as, while slave_add(), we will keep the primary + * slave based on slave_count,but not based on the primary port. + */ + for (slave_port = 0; slave_port < internals->slave_count; + slave_port++) { + if (internals->slaves[slave_port].port_id == + internals->primary_port) + break; + } + /* Set MAC Address of Bonded Device */ if (mac_address_set(bonded_eth_dev, - &internals->slaves[internals->primary_port].persisted_mac_addr) + &internals->slaves[slave_port].persisted_mac_addr) != 0) { RTE_BOND_LOG(ERR, "Failed to set MAC address on bonded device"); return -1; -- 2.20.1