diff options
author | Matt Ranostay <matt.ranostay@konsulko.com> | 2019-02-16 04:26:53 +0200 |
---|---|---|
committer | Matt Ranostay <matt.ranostay@konsulko.com> | 2019-02-18 19:17:43 +0000 |
commit | 246392fade81b768e1676411a2c938ce67cc596b (patch) | |
tree | 7a45ed3eaa070c4d1b50fe822db19360f4077829 /meta-agl-profile-telematics/recipes-core/systemd/files/0001-networkd-link-link_configure-factor-out-link_configu.patch | |
parent | 22ba7838454daceddbf6bb46da9f879bce99f2e7 (diff) |
meta-agl-profile-telematic: recipes-core: systemd: backport CANbus network support
Backport changes to enable configuration of CANbus interfaces automatically on device
detected, and on bootup.
Bug-AGL: SPEC-2189
Change-Id: I837aa50038e25f32ec3143513067fc3eec69385d
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
(cherry picked from commit 6a89e444a26a854e482b39b50d04f8e16aa01744)
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, 59 insertions, 0 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 new file mode 100644 index 000000000..d2117f652 --- /dev/null +++ b/meta-agl-profile-telematics/recipes-core/systemd/files/0001-networkd-link-link_configure-factor-out-link_configu.patch @@ -0,0 +1,59 @@ +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 + |