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

batman-adv: Add missing include for clear_/set_bit in DAT

bfd0fbaef270 ("batman-adv: Make DAT capability changes atomic") started to use clear_bit and set_bit 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/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index dc1191a..4ba7f61 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -19,6 +19,7 @@ #include "main.h"

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