See analogous change for log_debug() for discussion.
if (hashmap_isempty(link->network->mdb_entries_by_section))
goto finish;
- if (!link_has_carrier(link))
- return log_link_debug(link, "Link does not have carrier yet, setting MDB entries later.");
+ if (!link_has_carrier(link)) {
+ log_link_debug(link, "Link does not have carrier yet, setting MDB entries later.");
+ return 0;
+ }
if (link->network->bridge) {
Link *master;
if (r < 0)
return log_link_error_errno(link, r, "Failed to get Link object for Bridge=%s", link->network->bridge->ifname);
- if (!link_has_carrier(master))
- return log_link_debug(link, "Bridge interface %s does not have carrier yet, setting MDB entries later.", link->network->bridge->ifname);
+ if (!link_has_carrier(master)) {
+ log_link_debug(link, "Bridge interface %s does not have carrier yet, setting MDB entries later.", link->network->bridge->ifname);
+ return 0;
+ }
} else if (!streq_ptr(link->kind, "bridge")) {
log_link_warning(link, "Link is neither a bridge master nor a bridge port, ignoring [BridgeMDB] sections.");
if (r < 0) {
log_link_warning_errno(link, r, "rtnl: could not get nexthop family, ignoring: %m");
return 0;
- } else if (!IN_SET(tmp->family, AF_INET, AF_INET6))
- return log_link_debug(link, "rtnl: received nexthop message with invalid family %d, ignoring.", tmp->family);
+ } else if (!IN_SET(tmp->family, AF_INET, AF_INET6)) {
+ log_link_debug(link, "rtnl: received nexthop message with invalid family %d, ignoring.", tmp->family);
+ return 0;
+ }
r = sd_rtnl_message_nexthop_get_protocol(message, &tmp->protocol);
if (r < 0) {
#define log_link_full(link, level, ...) (void) log_link_full_errno(link, level, 0, __VA_ARGS__)
-#define log_link_debug(link, ...) log_link_full_errno(link, LOG_DEBUG, 0, __VA_ARGS__)
+#define log_link_debug(link, ...) log_link_full(link, LOG_DEBUG, __VA_ARGS__)
#define log_link_info(link, ...) log_link_full(link, LOG_INFO, __VA_ARGS__)
#define log_link_notice(link, ...) log_link_full(link, LOG_NOTICE, __VA_ARGS__)
#define log_link_warning(link, ...) log_link_full(link, LOG_WARNING, __VA_ARGS__)