commit c11fdfaefa46a83a668a73dc3ae90859e99ed251
author Sven Eckelmann <sven@narfation.org> Sun Jun 03 22:19:14 2012 +0200
committer Antonio Quartulli <ordex@autistici.org> Thu Jun 28 08:45:01 2012 +0200
tree ac6d6d4e67b687e04a5ae46b83754109acd9edeb
parent 7e071c79a6964130d1df4dc5ca5a6f3638680fce

batman-adv: Prefix types defines with BATADV_

Reported-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>

net/batman-adv/types.h

diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index 053c5d4..1d5d21e 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -22,12 +22,11 @@
 
 #include "packet.h"
 #include "bitarray.h"
+#include <linux/kernel.h>
 
-#define BAT_HEADER_LEN (ETH_HLEN + \
-	((sizeof(struct unicast_packet) > sizeof(struct bcast_packet) ? \
-	 sizeof(struct unicast_packet) : \
-	 sizeof(struct bcast_packet))))
-
+#define BATADV_HEADER_LEN \
+	(ETH_HLEN + max(sizeof(struct unicast_packet), \
+			sizeof(struct bcast_packet)))
 
 struct hard_iface {
 	struct list_head list;