Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 61bbb9a97bb94f1499a4e0c235fb7465e3bbfae2 Author: Sven Eckelmann sven@narfation.org Date: Sat Jan 28 10:23:30 2017 +0100

batman-adv: Fix includes for IS_ERR/ERR_PTR

IS_ERR/ERR_PTR are not defined in linux/device.h but in linux/err.h. The files using these macros therefore have to include the correct one.

Reported-by: Linus Luessing linus.luessing@web.de Signed-off-by: Sven Eckelmann sven@narfation.org

61bbb9a97bb94f1499a4e0c235fb7465e3bbfae2 net/batman-adv/debugfs.c | 2 +- net/batman-adv/tp_meter.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c index 5406148..e32ad47 100644 --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c @@ -19,7 +19,7 @@ #include "main.h"

#include <linux/debugfs.h> -#include <linux/device.h> +#include <linux/err.h> #include <linux/errno.h> #include <linux/export.h> #include <linux/fs.h> diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index 07f64b6..c94ebde 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -23,7 +23,7 @@ #include <linux/byteorder/generic.h> #include <linux/cache.h> #include <linux/compiler.h> -#include <linux/device.h> +#include <linux/err.h> #include <linux/etherdevice.h> #include <linux/fs.h> #include <linux/if_ether.h>