summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2021-04-30 07:06:28 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2021-04-30 19:11:25 +0900
commite361398e48133cf7e28d96ff32224e338b127735 (patch)
tree4a7519a1389ba9781a7e022a29ea5a4529c1811d
parented52cce33f588bbeb3d7f5d7f5e76a85cf6e4f89 (diff)
downloadsystemd-e361398e48133cf7e28d96ff32224e338b127735.tar.gz
network: can: shorten code a bit
-rw-r--r--src/network/networkd-can.c18
1 files 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)) {