The following commit has been merged in the merge/master branch: commit cfb15422f6896a20c279c679c2f71317b337a0eb Author: Sven Eckelmann sven@narfation.org Date: Thu Jun 18 18:53:22 2015 +0200

batman-adv: Add missing include for BUG_ON in MCAST

7f220ed1f063 ("batman-adv: Fix potential synchronization issues in mcast tvlv handler") started to use BUG_ON but did not add the include for these functions.

Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index b8002a5..c64d9b1 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -20,6 +20,7 @@

#include <linux/atomic.h> #include <linux/bitops.h> +#include <linux/bug.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> #include <linux/etherdevice.h>