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

On branch : master

commit 560fdd8c2c0f78a5885669539f1dfc48d7307ec8 Author: Sven Eckelmann sven.eckelmann@openmesh.com Date: Tue Dec 5 11:39:29 2017 +0100

batman-adv: Let packet.h include its headers directly

The headers used by packet.h should also be included by it directly. main.h is currently dealing with it in batman-adv, but this will no longer work when this header is moved to include/uapi/linux/.

Signed-off-by: Sven Eckelmann sven.eckelmann@openmesh.com

560fdd8c2c0f78a5885669539f1dfc48d7307ec8 net/batman-adv/main.h | 2 -- net/batman-adv/packet.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 5ac86df4..d5484ac3 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -217,10 +217,8 @@ enum batadv_uev_type {

/* Kernel headers */

-#include <linux/bitops.h> /* for packet.h */ #include <linux/compiler.h> #include <linux/etherdevice.h> -#include <linux/if_ether.h> /* for packet.h */ #include <linux/if_vlan.h> #include <linux/jiffies.h> #include <linux/percpu.h> diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h index dccbd4a6..6b656386 100644 --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@ -20,6 +20,8 @@ #define _NET_BATMAN_ADV_PACKET_H_

#include <asm/byteorder.h> +#include <linux/bitops.h> +#include <linux/if_ether.h> #include <linux/types.h>

/**