shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-30 23:21:22 +03:00
Code

network: dhcp6pd: drop link_has_preferred_subnet_id() and inline condition

Browse Source
This commit is contained in:
Yu Watanabe 2021-12-05 21:46:37 +09:00
parent 8b0bc54cdb
commit 11d8a83f53
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/network/networkd-dhcp-prefix-delegation.c
View File

@ -426,13 +426,6 @@ static int dhcp6_pd_request_address(
return 0; return 0;
} }
static bool link_has_preferred_subnet_id(Link *link) {
if (!link->network)
return false;
return link->network->dhcp6_pd_subnet_id >= 0;
}
static int dhcp6_pd_calculate_prefix( static int dhcp6_pd_calculate_prefix(
const struct in6_addr *pd_prefix, const struct in6_addr *pd_prefix,
uint8_t pd_prefix_len, uint8_t pd_prefix_len,
@ -471,9 +464,10 @@ static int dhcp6_pd_get_preferred_prefix(
assert(link); assert(link);
assert(link->manager); assert(link->manager);
assert(link->network);
assert(pd_prefix); assert(pd_prefix);
if (link_has_preferred_subnet_id(link)) { if (link->network->dhcp6_pd_subnet_id >= 0) {
/* If the link has a preference for a particular subnet id try to allocate that */ /* If the link has a preference for a particular subnet id try to allocate that */
r = dhcp6_pd_calculate_prefix(pd_prefix, pd_prefix_len, link->network->dhcp6_pd_subnet_id, &prefix); r = dhcp6_pd_calculate_prefix(pd_prefix, pd_prefix_len, link->network->dhcp6_pd_subnet_id, &prefix);