From d29ad81e3bd2b52895769a012f73e118c101794c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 2 Oct 2017 14:52:12 +0200 Subject: [PATCH] Minor line wrapping adjustment --- src/basic/barrier.h | 4 ++-- src/network/networkd-network.c | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/basic/barrier.h b/src/basic/barrier.h index 1e54c824252..fbc2d9d98dc 100644 --- a/src/basic/barrier.h +++ b/src/basic/barrier.h @@ -82,8 +82,8 @@ static inline bool barrier_we_aborted(Barrier *b) { } static inline bool barrier_is_aborted(Barrier *b) { - return IN_SET(b->barriers, BARRIER_I_ABORTED, BARRIER_THEY_ABORTED, - BARRIER_WE_ABORTED); + return IN_SET(b->barriers, + BARRIER_I_ABORTED, BARRIER_THEY_ABORTED, BARRIER_WE_ABORTED); } static inline bool barrier_place_and_sync(Barrier *b) { diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index a850c0caf41..72ba0916c94 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -749,7 +749,16 @@ int config_parse_tunnel(const char *unit, return 0; } - if (!IN_SET(netdev->kind, NETDEV_KIND_IPIP, NETDEV_KIND_SIT, NETDEV_KIND_GRE, NETDEV_KIND_GRETAP, NETDEV_KIND_IP6GRE, NETDEV_KIND_IP6GRETAP, NETDEV_KIND_VTI, NETDEV_KIND_VTI6, NETDEV_KIND_IP6TNL)) { + if (!IN_SET(netdev->kind, + NETDEV_KIND_IPIP, + NETDEV_KIND_SIT, + NETDEV_KIND_GRE, + NETDEV_KIND_GRETAP, + NETDEV_KIND_IP6GRE, + NETDEV_KIND_IP6GRETAP, + NETDEV_KIND_VTI, + NETDEV_KIND_VTI6, + NETDEV_KIND_IP6TNL)) { log_syntax(unit, LOG_ERR, filename, line, 0, "NetDev is not a tunnel, ignoring assignment: %s", rvalue); return 0; -- 2.47.3