From: Yu Watanabe Date: Thu, 29 Apr 2021 22:06:28 +0000 (+0900) Subject: network: can: shorten code a bit X-Git-Tag: v249-rc1~314^2~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e361398e48133cf7e28d96ff32224e338b127735;p=thirdparty%2Fsystemd.git network: can: shorten code a bit --- diff --git a/src/network/networkd-can.c b/src/network/networkd-can.c index 8e4cd21c6f1..1279d1b89f0 100644 --- a/src/network/networkd-can.c +++ b/src/network/networkd-can.c @@ -252,21 +252,13 @@ int link_configure_can(Link *link) { if (streq_ptr(link->kind, "can")) { /* The CAN interface must be down to configure bitrate, etc... */ - if ((link->flags & IFF_UP)) { + if ((link->flags & IFF_UP)) r = link_down(link, link_down_handler); - if (r < 0) { - link_enter_failed(link); - return r; - } - } else { + else r = link_set_can(link); - if (r < 0) { - link_enter_failed(link); - return r; - } - } - - return 0; + if (r < 0) + link_enter_failed(link); + return r; } if (!(link->flags & IFF_UP)) {