From 44c0acd64212ecd0f5059660374ed2fa27c0ecae Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 30 Apr 2021 06:57:15 +0900
Subject: [PATCH] network: drop duplicated link_up_can()

(cherry picked from commit f282ce20aaa767f5395b065f2be587cdef3e5491)
(cherry picked from commit 179a92c9d8b2df688764095ce1d242de20ee72fa)
(cherry picked from commit d1e06f70368ac4b08c2804f3ecfa7cb3ed874fac)
---
 src/network/networkd-can.c  | 46 ++-----------------------------------
 src/network/networkd-link.c |  2 +-
 src/network/networkd-link.h |  1 +
 3 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/src/network/networkd-can.c b/src/network/networkd-can.c
index e5504f7738..c8a23d5b70 100644
--- a/src/network/networkd-can.c
+++ b/src/network/networkd-can.c
@@ -52,48 +52,6 @@ int config_parse_can_bitrate(
         return 0;
 }
 
-static int link_up_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
-        int r;
-
-        assert(link);
-
-        if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
-                return 1;
-
-        r = sd_netlink_message_get_errno(m);
-        if (r < 0)
-                /* we warn but don't fail the link, as it may be brought up later */
-                log_link_message_warning_errno(link, m, r, "Could not bring up interface");
-
-        return 1;
-}
-
-static int link_up_can(Link *link) {
-        _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
-        int r;
-
-        assert(link);
-
-        log_link_debug(link, "Bringing CAN link up");
-
-        r = sd_rtnl_message_new_link(link->manager->rtnl, &req, RTM_SETLINK, link->ifindex);
-        if (r < 0)
-                return log_link_error_errno(link, r, "Could not allocate RTM_SETLINK message: %m");
-
-        r = sd_rtnl_message_link_set_flags(req, IFF_UP, IFF_UP);
-        if (r < 0)
-                return log_link_error_errno(link, r, "Could not set link flags: %m");
-
-        r = netlink_call_async(link->manager->rtnl, NULL, req, link_up_handler,
-                               link_netlink_destroy_callback, link);
-        if (r < 0)
-                return log_link_error_errno(link, r, "Could not send rtnetlink message: %m");
-
-        link_ref(link);
-
-        return 0;
-}
-
 static int link_set_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
         int r;
 
@@ -252,7 +210,7 @@ static int link_set_can(Link *link) {
         link_ref(link);
 
         if (!(link->flags & IFF_UP))
-                return link_up_can(link);
+                return link_up(link);
 
         return 0;
 }
@@ -304,7 +262,7 @@ int link_configure_can(Link *link) {
         }
 
         if (!(link->flags & IFF_UP)) {
-                r = link_up_can(link);
+                r = link_up(link);
                 if (r < 0) {
                         link_enter_failed(link);
                         return r;
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index c767c96142..1108d92251 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1895,7 +1895,7 @@ static int link_up_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link)
         return 1;
 }
 
-static int link_up(Link *link) {
+int link_up(Link *link) {
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
         int r;
 
diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index a0c5661149..3a02e895ac 100644
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -205,6 +205,7 @@ int link_get(Manager *m, int ifindex, Link **ret);
 int link_add(Manager *manager, sd_netlink_message *message, Link **ret);
 void link_drop(Link *link);
 
+int link_up(Link *link);
 int link_down(Link *link, link_netlink_message_handler_t callback);
 
 void link_enter_failed(Link *link);
-- 
2.25.1