The following commit has been merged in the master branch: commit 47d4522dd5130361d463b47f0e9a687c4b6697c2 Author: Sven Eckelmann sven@narfation.org Date: Fri May 24 16:51:29 2019 +0200

batman-adv: Add missing include for atomic functions

main.h is using atomic_add_unless and log.h atomic_read. The main header linux/atomic.h should be included for these files.

Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Simon Wunderlich sw@simonwunderlich.de

diff --git a/net/batman-adv/log.h b/net/batman-adv/log.h index 5504637e63d8..741cfa3719ff 100644 --- a/net/batman-adv/log.h +++ b/net/batman-adv/log.h @@ -9,6 +9,7 @@

#include "main.h"

+#include <linux/atomic.h> #include <linux/bitops.h> #include <linux/compiler.h> #include <linux/printk.h> diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 11d051dbbda4..821a7de45256 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -205,6 +205,7 @@ enum batadv_uev_type {

/* Kernel headers */

+#include <linux/atomic.h> #include <linux/compiler.h> #include <linux/etherdevice.h> #include <linux/if_vlan.h>