SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network: introduce link_is_up() helper function

Browse Source
This commit is contained in:
Yu Watanabe
2026-03-09 10:57:06 +09:00
parent 20911fe177
commit ec4f646759
6 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-link.c
+11 -10
View File
@@ -815,7 +815,6 @@ int link_ipv6ll_gained(Link *link) {
int link_handle_bound_to_list(Link *link) {
bool required_up = false;
bool link_is_up = false;
Link *l;
assert(link);
@@ -826,18 +825,15 @@ int link_handle_bound_to_list(Link *link) {
if (hashmap_isempty(link->bound_to_links))
return 0;
if (link->flags & IFF_UP)
link_is_up = true;
HASHMAP_FOREACH(l, link->bound_to_links)
if (link_has_carrier(l)) {
required_up = true;
break;
}
if (!required_up && link_is_up)
if (!required_up && link_is_up(link))
return link_request_to_bring_up_or_down(link, /* up= */ false);
if (required_up && !link_is_up)
if (required_up && !link_is_up(link))
return link_request_to_bring_up_or_down(link, /* up= */ true);
return 0;
@@ -2012,7 +2008,7 @@ void link_update_operstate(Link *link, bool also_update_master) {
carrier_state = LINK_CARRIER_STATE_ENSLAVED;
else
carrier_state = LINK_CARRIER_STATE_CARRIER;
} else if (link->flags & IFF_UP)
} else if (link_is_up(link))
carrier_state = LINK_CARRIER_STATE_NO_CARRIER;
else
carrier_state = LINK_CARRIER_STATE_OFF;
@@ -2147,6 +2143,11 @@ bool link_has_carrier(Link *link) {
return netif_has_carrier(link->kernel_operstate, link->flags);
}
bool link_is_up(Link *link) {
assert(link);
return FLAGS_SET(link->flags, IFF_UP);
}
bool link_multicast_enabled(Link *link) {
assert(link);
@@ -2226,7 +2227,7 @@ static int link_update_flags(Link *link, sd_netlink_message *message) {
log_link_debug(link, "Unknown link flags lost, ignoring: %#.5x", unknown_flags_removed);
}
link_was_admin_up = link->flags & IFF_UP;
link_was_admin_up = link_is_up(link);
had_carrier = link_has_carrier(link);
link->flags = flags;
@@ -2236,9 +2237,9 @@ static int link_update_flags(Link *link, sd_netlink_message *message) {
r = 0;
if (!link_was_admin_up && (link->flags & IFF_UP))
if (!link_was_admin_up && link_is_up(link))
r = link_admin_state_up(link);
else if (link_was_admin_up && !(link->flags & IFF_UP))
else if (link_was_admin_up && !link_is_up(link))
r = link_admin_state_down(link);
if (r < 0)
return r;