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

network: rename link_acquire_conf() -> link_acquire_dynamic_conf()

Browse Source 
To clarify it starts dynamic configuration engines e.g. DHCP clients.
This commit is contained in:
Yu Watanabe
2021-06-08 06:33:27 +09:00
parent 9710895378
commit 8566df791e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-link.c
+8 -8
View File
@@ -1160,7 +1160,7 @@ static int link_set_flags(Link *link) {
return 0;
}
static int link_acquire_ipv6_conf(Link *link) {
static int link_acquire_dynamic_ipv6_conf(Link *link) {
int r;
assert(link);
@@ -1195,7 +1195,7 @@ static int link_acquire_ipv6_conf(Link *link) {
return 0;
}
static int link_acquire_ipv4_conf(Link *link) {
static int link_acquire_dynamic_ipv4_conf(Link *link) {
int r;
assert(link);
@@ -1224,17 +1224,17 @@ static int link_acquire_ipv4_conf(Link *link) {
return 0;
}
static int link_acquire_conf(Link *link) {
static int link_acquire_dynamic_conf(Link *link) {
int r;
assert(link);
r = link_acquire_ipv4_conf(link);
r = link_acquire_dynamic_ipv4_conf(link);
if (r < 0)
return r;
if (in6_addr_is_set(&link->ipv6ll_address)) {
r = link_acquire_ipv6_conf(link);
r = link_acquire_dynamic_ipv6_conf(link);
if (r < 0)
return r;
}
@@ -1862,7 +1862,7 @@ static int link_joined(Link *link) {
if (!link_has_carrier(link))
return 0;
return link_acquire_conf(link);
return link_acquire_dynamic_conf(link);
}
static int netdev_join_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
@@ -2711,7 +2711,7 @@ int link_ipv6ll_gained(Link *link, const struct in6_addr *address) {
link_check_ready(link);
if (IN_SET(link->state, LINK_STATE_CONFIGURING, LINK_STATE_CONFIGURED)) {
r = link_acquire_ipv6_conf(link);
r = link_acquire_dynamic_ipv6_conf(link);
if (r < 0) {
link_enter_failed(link);
return r;
@@ -2793,7 +2793,7 @@ static int link_carrier_gained(Link *link) {
}
if (IN_SET(link->state, LINK_STATE_CONFIGURING, LINK_STATE_CONFIGURED)) {
r = link_acquire_conf(link);
r = link_acquire_dynamic_conf(link);
if (r < 0) {
link_enter_failed(link);
return r;