From e361398e48133cf7e28d96ff32224e338b127735 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 30 Apr 2021 07:06:28 +0900 Subject: [PATCH] network: can: shorten code a bit --- src/network/networkd-can.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/network/networkd-can.c b/src/network/networkd-can.c index 8e4cd21c6f..1279d1b89f 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)) {