The following commit has been merged in the merge/master branch: commit 2bf6bf58b34c1eddd509703c65bf69d5c543a3fa Author: Sven Eckelmann sven@narfation.org Date: Mon Feb 29 08:51:07 2016 +0100

batman-adv: Add missing headers for bool type

Fixes: d58a13597ec2 ("batman-adv: Use bool as return type for boolean functions") Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h index f93cbc7..0e6e9d0 100644 --- a/net/batman-adv/bitarray.h +++ b/net/batman-adv/bitarray.h @@ -22,6 +22,7 @@

#include <linux/bitops.h> #include <linux/compiler.h> +#include <linux/stddef.h> #include <linux/types.h>

/** diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index 15c2884..13dcfe5 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -20,6 +20,7 @@

#include "main.h"

+#include <linux/types.h> #include <net/rtnetlink.h>

struct net_device;