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

batman at open-mesh.org batman at open-mesh.org
Tue Jan 13 00:24:19 CET 2015


The following commit has been merged in the master branch:
commit 9687a31c84d7eca038a5335d8d804c11bd5d8653
Author: Antonio Quartulli <antonio at meshcoding.com>
Date:   Mon Sep 1 14:37:26 2014 +0200

    batman-adv: checkpatch - No space is necessary after a cast
    
    Signed-off-by: Antonio Quartulli <antonio at meshcoding.com>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 2a59b04..18286f8 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -312,10 +312,10 @@ static inline bool batadv_has_timed_out(unsigned long timestamp,
  *  - when adding 128 - it is neither a predecessor nor a successor,
  *  - after adding more than 127 to the starting value - it is a successor
  */
-#define batadv_seq_before(x, y) ({typeof(x) _d1 = (x); \
-				 typeof(y) _d2 = (y); \
-				 typeof(x) _dummy = (_d1 - _d2); \
-				 (void) (&_d1 == &_d2); \
+#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_after(x, y) batadv_seq_before(y, x)
 

-- 
LinuxNextTracking


More information about the linux-merge mailing list