diff options
author | Matt Ranostay <matt.ranostay@konsulko.com> | 2019-04-09 20:59:02 +0300 |
---|---|---|
committer | Matt Ranostay <matt.ranostay@konsulko.com> | 2019-04-09 21:12:54 +0300 |
commit | ada23a7ad73449dd17000f9b5922a7ab5bd9d37f (patch) | |
tree | 9fe58d954b2c8144d38a903ae29df3cc7bcd8b35 /meta-agl-profile-telematics/recipes-core/systemd/files/0001-networkd-link-link_configure-factor-out-link_configu.patch | |
parent | 99cef05b4c32c401868c7f487784130e607ca74c (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/0001-networkd-link-link_configure-factor-out-link_configu.patch')
-rw-r--r-- | meta-agl-profile-telematics/recipes-core/systemd/files/0001-networkd-link-link_configure-factor-out-link_configu.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/meta-agl-profile-telematics/recipes-core/systemd/files/0001-networkd-link-link_configure-factor-out-link_configu.patch b/meta-agl-profile-telematics/recipes-core/systemd/files/0001-networkd-link-link_configure-factor-out-link_configu.patch deleted file mode 100644 index d2117f652..000000000 --- a/meta-agl-profile-telematics/recipes-core/systemd/files/0001-networkd-link-link_configure-factor-out-link_configu.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 249a124d84e586f43aa47682d512a83a4322fb4b Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Wed, 30 May 2018 11:47:23 +0200 -Subject: [PATCH 1/3] networkd-link: link_configure(); factor out - link_configure_can() into separate function - ---- - src/network/networkd-link.c | 28 ++++++++++++++++------------ - 1 file changed, 16 insertions(+), 12 deletions(-) - -diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c -index 4c57fa1793..c29ae30ef0 100644 ---- a/src/network/networkd-link.c -+++ b/src/network/networkd-link.c -@@ -2509,6 +2509,20 @@ static int link_update_lldp(Link *link) { - return r; - } - -+static int link_configure_can(Link *link) { -+ int r; -+ -+ if (!(link->flags & IFF_UP)) { -+ r = link_up_can(link); -+ if (r < 0) { -+ link_enter_failed(link); -+ return r; -+ } -+ } -+ -+ return 0; -+} -+ - static int link_configure(Link *link) { - int r; - -@@ -2516,18 +2530,8 @@ static int link_configure(Link *link) { - assert(link->network); - assert(link->state == LINK_STATE_PENDING); - -- if (streq_ptr(link->kind, "vcan")) { -- -- if (!(link->flags & IFF_UP)) { -- r = link_up_can(link); -- if (r < 0) { -- link_enter_failed(link); -- return r; -- } -- } -- -- return 0; -- } -+ if (streq_ptr(link->kind, "vcan")) -+ return link_configure_can(link); - - /* Drop foreign config, but ignore loopback or critical devices. - * We do not want to remove loopback address or addresses used for root NFS. */ --- -2.17.1 - |