The following commit has been merged in the merge/master branch: commit 9685688ae7dd85804aec2f6ce760611551fe9635 Author: Sven Eckelmann sven@narfation.org Date: Sat May 7 09:50:44 2016 +0200

batman-adv: Add missing include for batadv_v_neigh_is_sob

batadv_v_neigh_is_sob started to use false which is defined in linux/stddef.h.

Fixes: 036aa7b7181e ("batman-adv: Avoid nullptr derefence in batadv_v_neigh_is_sob") Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 0caca2f..1f960c9 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -27,6 +27,7 @@ #include <linux/rculist.h> #include <linux/rcupdate.h> #include <linux/seq_file.h> +#include <linux/stddef.h> #include <linux/types.h> #include <linux/workqueue.h>