A link should only ever be part of one, but if we accidentally do both, let's do it
in the right order so the failure is more obvious in the logs.
hashmap_isempty(link->network->macvlans))
return link_enslaved(link);
hashmap_isempty(link->network->macvlans))
return link_enslaved(link);
- if (link->network->bridge) {
+ if (link->network->bond) {
log_struct_link(LOG_DEBUG, link,
"MESSAGE=%s: enslaving by '%s'",
log_struct_link(LOG_DEBUG, link,
"MESSAGE=%s: enslaving by '%s'",
- link->ifname, link->network->bridge->name,
- NETDEV(link->network->bridge),
+ link->ifname, link->network->bond->name,
+ NETDEV(link->network->bond),
- r = netdev_enslave(link->network->bridge, link, &enslave_handler);
+ r = netdev_enslave(link->network->bond, link, &enslave_handler);
if (r < 0) {
log_struct_link(LOG_WARNING, link,
"MESSAGE=%s: could not enslave by '%s': %s",
if (r < 0) {
log_struct_link(LOG_WARNING, link,
"MESSAGE=%s: could not enslave by '%s': %s",
- link->ifname, link->network->bridge->name, strerror(-r),
- NETDEV(link->network->bridge),
+ link->ifname, link->network->bond->name, strerror(-r),
+ NETDEV(link->network->bond),
NULL);
link_enter_failed(link);
return r;
NULL);
link_enter_failed(link);
return r;
- if (link->network->bond) {
+ if (link->network->bridge) {
log_struct_link(LOG_DEBUG, link,
"MESSAGE=%s: enslaving by '%s'",
log_struct_link(LOG_DEBUG, link,
"MESSAGE=%s: enslaving by '%s'",
- link->ifname, link->network->bond->name,
- NETDEV(link->network->bond),
+ link->ifname, link->network->bridge->name,
+ NETDEV(link->network->bridge),
- r = netdev_enslave(link->network->bond, link, &enslave_handler);
+ r = netdev_enslave(link->network->bridge, link, &enslave_handler);
if (r < 0) {
log_struct_link(LOG_WARNING, link,
"MESSAGE=%s: could not enslave by '%s': %s",
if (r < 0) {
log_struct_link(LOG_WARNING, link,
"MESSAGE=%s: could not enslave by '%s': %s",
- link->ifname, link->network->bond->name, strerror(-r),
- NETDEV(link->network->bond),
+ link->ifname, link->network->bridge->name, strerror(-r),
+ NETDEV(link->network->bridge),
NULL);
link_enter_failed(link);
return r;
NULL);
link_enter_failed(link);
return r;