summaryrefslogtreecommitdiffstats
path: root/meta-agl-profile-telematics/recipes-core/systemd/files/0002-networkd-link-link_up_can-move-function-upwards.patch
diff options
context:
space:
mode:
authorMatt Ranostay <matt.ranostay@konsulko.com>2019-04-09 20:59:02 +0300
committerMatt Ranostay <matt.ranostay@konsulko.com>2019-04-09 21:12:54 +0300
commitada23a7ad73449dd17000f9b5922a7ab5bd9d37f (patch)
tree9fe58d954b2c8144d38a903ae29df3cc7bcd8b35 /meta-agl-profile-telematics/recipes-core/systemd/files/0002-networkd-link-link_up_can-move-function-upwards.patch
parent99cef05b4c32c401868c7f487784130e607ca74c (diff)
meta-agl-profile-telematics: recipes-core: systemd: remove v234 bbappend
Recent upgrade to thud brings in v239 which already has the canbus changes. Change-Id: If5cd09e55117f56c3ff8bb9b1155519e7e2a40d2 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
Diffstat (limited to 'meta-agl-profile-telematics/recipes-core/systemd/files/0002-networkd-link-link_up_can-move-function-upwards.patch')
-rw-r--r--meta-agl-profile-telematics/recipes-core/systemd/files/0002-networkd-link-link_up_can-move-function-upwards.patch82
1 files changed, 0 insertions, 82 deletions
diff --git a/meta-agl-profile-telematics/recipes-core/systemd/files/0002-networkd-link-link_up_can-move-function-upwards.patch b/meta-agl-profile-telematics/recipes-core/systemd/files/0002-networkd-link-link_up_can-move-function-upwards.patch
deleted file mode 100644
index 6e2f4109c..000000000
--- a/meta-agl-profile-telematics/recipes-core/systemd/files/0002-networkd-link-link_up_can-move-function-upwards.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 833fbbe448fca5f7047708db2d0d91778aabbb93 Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Wed, 30 May 2018 16:31:59 +0200
-Subject: [PATCH 2/3] networkd-link: link_up_can(): move function upwards
-
-This patch is a preparation patch, to avoid forward declarations in the
-next patch.
----
- src/network/networkd-link.c | 50 ++++++++++++++++++-------------------
- 1 file changed, 25 insertions(+), 25 deletions(-)
-
-diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
-index c29ae30ef0..a736dc1a74 100644
---- a/src/network/networkd-link.c
-+++ b/src/network/networkd-link.c
-@@ -1780,6 +1780,31 @@ int link_up(Link *link) {
- return 0;
- }
-
-+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 = sd_netlink_call_async(link->manager->rtnl, req, link_up_handler, link, 0, NULL);
-+ if (r < 0)
-+ return log_link_error_errno(link, r, "Could not send rtnetlink message: %m");
-+
-+ link_ref(link);
-+
-+ return 0;
-+}
-+
- static int link_down_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) {
- _cleanup_link_unref_ Link *link = userdata;
- int r;
-@@ -1824,31 +1849,6 @@ int link_down(Link *link) {
- return 0;
- }
-
--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 = sd_netlink_call_async(link->manager->rtnl, req, link_up_handler, link, 0, NULL);
-- if (r < 0)
-- return log_link_error_errno(link, r, "Could not send rtnetlink message: %m");
--
-- link_ref(link);
--
-- return 0;
--}
--
- static int link_handle_bound_to_list(Link *link) {
- Link *l;
- Iterator i;
---
-2.17.1
-