1 From 833fbbe448fca5f7047708db2d0d91778aabbb93 Mon Sep 17 00:00:00 2001
2 From: Marc Kleine-Budde <mkl@pengutronix.de>
3 Date: Wed, 30 May 2018 16:31:59 +0200
4 Subject: [PATCH 2/3] networkd-link: link_up_can(): move function upwards
6 This patch is a preparation patch, to avoid forward declarations in the
9 src/network/networkd-link.c | 50 ++++++++++++++++++-------------------
10 1 file changed, 25 insertions(+), 25 deletions(-)
12 diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
13 index c29ae30ef0..a736dc1a74 100644
14 --- a/src/network/networkd-link.c
15 +++ b/src/network/networkd-link.c
16 @@ -1780,6 +1780,31 @@ int link_up(Link *link) {
20 +static int link_up_can(Link *link) {
21 + _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
26 + log_link_debug(link, "Bringing CAN link up");
28 + r = sd_rtnl_message_new_link(link->manager->rtnl, &req, RTM_SETLINK, link->ifindex);
30 + return log_link_error_errno(link, r, "Could not allocate RTM_SETLINK message: %m");
32 + r = sd_rtnl_message_link_set_flags(req, IFF_UP, IFF_UP);
34 + return log_link_error_errno(link, r, "Could not set link flags: %m");
36 + r = sd_netlink_call_async(link->manager->rtnl, req, link_up_handler, link, 0, NULL);
38 + return log_link_error_errno(link, r, "Could not send rtnetlink message: %m");
45 static int link_down_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) {
46 _cleanup_link_unref_ Link *link = userdata;
48 @@ -1824,31 +1849,6 @@ int link_down(Link *link) {
52 -static int link_up_can(Link *link) {
53 - _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
58 - log_link_debug(link, "Bringing CAN link up");
60 - r = sd_rtnl_message_new_link(link->manager->rtnl, &req, RTM_SETLINK, link->ifindex);
62 - return log_link_error_errno(link, r, "Could not allocate RTM_SETLINK message: %m");
64 - r = sd_rtnl_message_link_set_flags(req, IFF_UP, IFF_UP);
66 - return log_link_error_errno(link, r, "Could not set link flags: %m");
68 - r = sd_netlink_call_async(link->manager->rtnl, req, link_up_handler, link, 0, NULL);
70 - return log_link_error_errno(link, r, "Could not send rtnetlink message: %m");
77 static int link_handle_bound_to_list(Link *link) {