mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev)
 {
        struct bond_dev_private *internals = bonded_eth_dev->data->dev_private;
+       bool set;
        int i;
 
        /* Update slave devices MAC addresses */
        case BONDING_MODE_TLB:
        case BONDING_MODE_ALB:
        default:
+               set = true;
                for (i = 0; i < internals->slave_count; i++) {
                        if (internals->slaves[i].port_id ==
                                        internals->current_primary_port) {
                                                bonded_eth_dev->data->mac_addrs)) {
                                        RTE_BOND_LOG(ERR, "Failed to update port Id %d MAC address",
                                                        internals->current_primary_port);
-                                       return -1;
+                                       set = false;
                                }
                        } else {
                                if (rte_eth_dev_default_mac_addr_set(
                                                &internals->slaves[i].persisted_mac_addr)) {
                                        RTE_BOND_LOG(ERR, "Failed to update port Id %d MAC address",
                                                        internals->slaves[i].port_id);
-                                       return -1;
                                }
                        }
                }
+               if (!set)
+                       return -1;
        }
 
        return 0;