diff options
| author |   Sven Eckelmann <sven@narfation.org> | 2012-06-03 22:19:14 +0200 |
|---|---|---|
| committer |   Antonio Quartulli <ordex@autistici.org> | 2012-06-28 08:45:01 +0200 |
| commit | c11fdfaefa46a83a668a73dc3ae90859e99ed251 (patch) | |
| tree | ac6d6d4e67b687e04a5ae46b83754109acd9edeb /net/batman-adv/types.h | |
| parent | batman-adv: Prefix packet defines with BATADV_ (diff) | |
| download | linux-dev-c11fdfaefa46a83a668a73dc3ae90859e99ed251.tar.xz linux-dev-c11fdfaefa46a83a668a73dc3ae90859e99ed251.zip | |
batman-adv: Prefix types defines with BATADV_
Reported-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to '')
| -rw-r--r-- | net/batman-adv/types.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 053c5d4776ce..1d5d21ed8e8a 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; |