]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Minor line wrapping adjustment 6941/head
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 2 Oct 2017 12:52:12 +0000 (14:52 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 2 Oct 2017 12:52:12 +0000 (14:52 +0200)
src/basic/barrier.h
src/network/networkd-network.c

index 1e54c824252664b153765d6856df13add41fb816..fbc2d9d98dc3b113bba196a9a49e0c03fcfe4457 100644 (file)
@@ -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) {
index a850c0caf41adb53b1fbb69856fab037db805724..72ba0916c9483407a1eb679a0b2102025b56cc44 100644 (file)
@@ -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;