The following commit has been merged in the master branch: commit 3a64469e4fddeeca8e6fba7ea4e9558a4af3a1c8 Author: Sven Eckelmann sven@narfation.org Date: Sun Nov 19 17:12:04 2017 +0100
batman-adv: Include net.h for net_ratelimited_function
The linux/net.h provides the net_ratelimited_function. It should therefore be included directly before it is used.
Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Simon Wunderlich sw@simonwunderlich.de
diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index d37fe5ed6117..bd421408d9e7 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -36,6 +36,7 @@ #include <linux/kref.h> #include <linux/list.h> #include <linux/lockdep.h> +#include <linux/net.h> #include <linux/netdevice.h> #include <linux/printk.h> #include <linux/random.h> diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 27a0c34a5ad0..b4b20ad1ed9a 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -37,6 +37,7 @@ #include <linux/kref.h> #include <linux/list.h> #include <linux/lockdep.h> +#include <linux/net.h> #include <linux/netdevice.h> #include <linux/netlink.h> #include <linux/rculist.h>
linux-merge@lists.open-mesh.org