From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 29 Apr 2021 22:03:13 +0000 (+0900)
Subject: network: make CAN device follow activation policy
X-Git-Tag: v249-rc1~314^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9fc3b0da97924d778a5d77316fa55302918b156;p=thirdparty%2Fsystemd.git

network: make CAN device follow activation policy
---

diff --git a/src/network/networkd-can.c b/src/network/networkd-can.c
index e448a1ad02c..787cfd711e7 100644
--- a/src/network/networkd-can.c
+++ b/src/network/networkd-can.c
@@ -69,6 +69,12 @@ static int link_set_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link)
 
         log_link_debug(link, "Link set");
 
+        r = link_activate(link);
+        if (r < 0) {
+                link_enter_failed(link);
+                return 1;
+        }
+
         link->can_configured = true;
         link_check_ready(link);
 
@@ -220,9 +226,6 @@ static int link_set_can(Link *link) {
 
         link_ref(link);
 
-        if (!(link->flags & IFF_UP))
-                return link_up(link);
-
         return 0;
 }
 
@@ -264,13 +267,9 @@ int link_configure_can(Link *link) {
                 return r;
         }
 
-        if (!(link->flags & IFF_UP)) {
-                r = link_up(link);
-                if (r < 0) {
-                        link_enter_failed(link);
-                        return r;
-                }
-        }
+        r = link_activate(link);
+        if (r < 0)
+                return r;
 
         link->can_configured = true;
         link_check_ready(link);