[linux-next] LinuxNextTracking branch, master, updated. next-20180306

batman at open-mesh.org batman at open-mesh.org
Wed Mar 7 00:16:32 CET 2018


The following commit has been merged in the master branch:
commit 84d0a394808621619a4b319c6eed16e3b389e214
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Jan 5 09:54:32 2018 +0100

    batman-adv: Fix indentation of batadv_seq_before
    
    Also multiline macros should have their statements start on a tabstop. This
    was detected by checkpatch.pl after commit a134f8de9f40 ("checkpatch:
    improve the TABSTOP test to include declarations").
    
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index d5d65999207e..057a28a9fe88 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -331,11 +331,13 @@ static inline bool batadv_has_timed_out(unsigned long timestamp,
  *
  * Return: true when x is a predecessor of y, false otherwise
  */
-#define batadv_seq_before(x, y) ({typeof(x)_d1 = (x); \
-				 typeof(y)_d2 = (y); \
-				 typeof(x)_dummy = (_d1 - _d2); \
-				 (void)(&_d1 == &_d2); \
-				 _dummy > batadv_smallest_signed_int(_dummy); })
+#define batadv_seq_before(x, y) ({ \
+	typeof(x)_d1 = (x); \
+	typeof(y)_d2 = (y); \
+	typeof(x)_dummy = (_d1 - _d2); \
+	(void)(&_d1 == &_d2); \
+	_dummy > batadv_smallest_signed_int(_dummy); \
+})
 
 /**
  * batadv_seq_after() - Checks if a sequence number x is a successor of y

-- 
LinuxNextTracking


More information about the linux-merge mailing list