commit a484ac3f407a6a22d4eb63da23e98e8e76833722 (HEAD -> bugfix-bond-same-mac-20240429, batmancn/bugfix-bond-same-mac-20240429)
Author: batmancn <
batmanustc@gmail.com>
Date: Mon Apr 29 18:44:18 2024 +0800
Bugfix, config same mac address of bond slave.
Signed-off-by: Simon Jones <
batmanustc@gmail.com>
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index c40d18d128..0387a9b2aa 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1562,6 +1562,15 @@ mac_address_members_update(struct rte_eth_dev *bonding_eth_dev)
}
break;
case BONDING_MODE_8023AD:
+ for (i = 0; i < internals->slave_count; i++) {
+ if (rte_eth_dev_default_mac_addr_set(
+ internals->slaves[i].port_id,
+ bonded_eth_dev->data->mac_addrs)) {
+ RTE_BOND_LOG(ERR, "Failed to update port Id %d MAC address",
+ internals->slaves[i].port_id);
+ return -1;
+ }
+ }
bond_mode_8023ad_mac_address_update(bonding_eth_dev);
break;
case BONDING_MODE_ACTIVE_BACKUP:
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index f1c658f49e..c3f8b8d01e 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -1746,7 +1746,8 @@ rte_eth_dev_start(uint16_t port_id)
return ret;
/* Lets restore MAC now if device does not support live change */
- if (*dev_info.dev_flags & RTE_ETH_DEV_NOLIVE_MAC_ADDR)
+ if ((*dev_info.dev_flags & RTE_ETH_DEV_NOLIVE_MAC_ADDR) &&
+ !(*dev_info.dev_flags & RTE_ETH_DEV_BONDED_SLAVE))
eth_dev_mac_restore(dev, &dev_info);
diag = (*dev->dev_ops->dev_start)(dev);
~