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

network: use request queue to handle always-up or -down activation policy

Browse Source
This commit is contained in:
Yu Watanabe
2021-06-09 04:59:23 +09:00
parent 68f5206349
commit 712fd5d25a
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-link.c
+4 -4
View File
@@ -1581,8 +1581,8 @@ static int link_admin_state_up(Link *link) {
return 0;
if (link->activated && link->network->activation_policy == ACTIVATION_POLICY_ALWAYS_DOWN) {
log_link_info(link, "ActivationPolicy is \"always-off\", forcing link down");
return link_down(link);
log_link_info(link, "ActivationPolicy is \"always-off\", forcing link down.");
return link_request_to_bring_up_or_down(link, /* up = */ false);
}
/* We set the ipv6 mtu after the device mtu, but the kernel resets
@@ -1601,8 +1601,8 @@ static int link_admin_state_down(Link *link) {
return 0;
if (link->activated && link->network->activation_policy == ACTIVATION_POLICY_ALWAYS_UP) {
log_link_info(link, "ActivationPolicy is \"always-on\", forcing link up");
return link_up(link);
log_link_info(link, "ActivationPolicy is \"always-on\", forcing link up.");
return link_request_to_bring_up_or_down(link, /* up = */ true);
}
return 0;
src/network/networkd-setlink.c
-4
View File
@@ -835,10 +835,6 @@ static int link_up_or_down(Link *link, bool up, link_netlink_message_handler_t c
return 0;
}
int link_up(Link *link) {
return link_up_or_down(link, true, link_up_handler);
}
int link_down(Link *link) {
return link_up_or_down(link, false, link_down_handler);
}
src/network/networkd-setlink.h
-1
View File
@@ -36,7 +36,6 @@ int link_configure_mtu(Link *link);
int request_process_set_link(Request *req);
int link_up(Link *link);
int link_down(Link *link);
int request_process_activation(Request *req);