meta-agl-profile-telematics/recipes-core/systemd/files/0001-networkd-link-link_configure-factor-out-link_configu.patch

   1 From 249a124d84e586f43aa47682d512a83a4322fb4b Mon Sep 17 00:00:00 2001
   2 From: Marc Kleine-Budde <mkl@pengutronix.de>
   3 Date: Wed, 30 May 2018 11:47:23 +0200
   4 Subject: [PATCH 1/3] networkd-link: link_configure(); factor out
   5  link_configure_can() into separate function
   6
   7 ---
   8  src/network/networkd-link.c | 28 ++++++++++++++++------------
   9  1 file changed, 16 insertions(+), 12 deletions(-)
  10
  11 diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
  12 index 4c57fa1793..c29ae30ef0 100644
  13 --- a/src/network/networkd-link.c
  14 +++ b/src/network/networkd-link.c
  15 @@ -2509,6 +2509,20 @@ static int link_update_lldp(Link *link) {
  16          return r;
  17  }
  18
  19 +static int link_configure_can(Link *link) {
  20 +        int r;
  21 +
  22 +        if (!(link->flags & IFF_UP)) {
  23 +                r = link_up_can(link);
  24 +                if (r < 0) {
  25 +                        link_enter_failed(link);
  26 +                        return r;
  27 +                }
  28 +        }
  29 +
  30 +        return 0;
  31 +}
  32 +
  33  static int link_configure(Link *link) {
  34          int r;
  35
  36 @@ -2516,18 +2530,8 @@ static int link_configure(Link *link) {
  37          assert(link->network);
  38          assert(link->state == LINK_STATE_PENDING);
  39
  40 -        if (streq_ptr(link->kind, "vcan")) {
  41 -
  42 -                if (!(link->flags & IFF_UP)) {
  43 -                        r = link_up_can(link);
  44 -                        if (r < 0) {
  45 -                                link_enter_failed(link);
  46 -                                return r;
  47 -                        }
  48 -                }
  49 -
  50 -                return 0;
  51 -        }
  52 +        if (streq_ptr(link->kind, "vcan"))
  53 +                return link_configure_can(link);
  54
  55          /* Drop foreign config, but ignore loopback or critical devices.
  56           * We do not want to remove loopback address or addresses used for root NFS. */
  57 --
  58 2.17.1
  59