From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 6 Jun 2021 08:02:00 +0000 (+0900)
Subject: network: use request queue to handle always-up or -down activation policy
X-Git-Tag: v249-rc1~60^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=712fd5d25afad3d7190115df8d5fe7453d06ad54;p=thirdparty%2Fsystemd.git

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

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index d49ae056233..66a3740e93d 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -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;
diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c
index a5aeb7636a7..bf54b5c8bfd 100644
--- a/src/network/networkd-setlink.c
+++ b/src/network/networkd-setlink.c
@@ -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);
 }
diff --git a/src/network/networkd-setlink.h b/src/network/networkd-setlink.h
index 8caee1a1c05..0dc7415257f 100644
--- a/src/network/networkd-setlink.h
+++ b/src/network/networkd-setlink.h
@@ -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);