summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Eckelmann <sven.eckelmann@openmesh.com>2017-12-21 10:17:38 +0100
committerDavid S. Miller <davem@davemloft.net>2017-12-21 15:35:53 -0500
commit4e58452b6fc391c35611693b12a3f97bd60f6da8 (patch)
treed89b77ff91ad2749ce35cb7227025cdd53f90591
parenta0e2e75a884c1e6ae2c4cd40bf473dc93420dc0a (diff)
downloadop-kernel-dev-4e58452b6fc391c35611693b12a3f97bd60f6da8.zip
op-kernel-dev-4e58452b6fc391c35611693b12a3f97bd60f6da8.tar.gz
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> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/batman-adv/main.h2
-rw-r--r--net/batman-adv/packet.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 5ac86df..d5484ac 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 dccbd4a..6b65638 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>
/**
OpenPOWER on IntegriCloud