From: Sven Eckelmann <sven.eckelmann@openmesh.com>
To: netdev@vger.kernel.org
Cc: b.a.t.m.a.n@lists.open-mesh.org,
Eric Dumazet <edumazet@google.com>,
linux-kernel@vger.kernel.org, Jiri Pirko <jiri@mellanox.com>,
"David S . Miller" <davem@davemloft.net>,
Willem de Bruijn <willemdebruijn.kernel@gmail.com>,
Tom Herbert <tom@herbertland.com>,
Sven Eckelmann <sven.eckelmann@openmesh.com>
Subject: [RFC v3 1/4] batman-adv: Let packet.h include its headers directly
Date: Fri, 15 Dec 2017 19:23:10 +0100 [thread overview]
Message-ID: <20171215182313.15767-2-sven.eckelmann@openmesh.com> (raw)
In-Reply-To: <20171215182313.15767-1-sven.eckelmann@openmesh.com>
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>
---
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 5ac86df48c42..d5484ac381d3 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 dccbd4a6f019..6b6563867455 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>
/**
--
2.11.0
next prev parent reply other threads:[~2017-12-15 18:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-15 18:23 [RFC v3 0/4] flow_dissector: Provide basic batman-adv unicast handling Sven Eckelmann
2017-12-15 18:23 ` Sven Eckelmann [this message]
2017-12-15 18:23 ` [RFC v3 2/4] batman-adv: Remove usage of BIT(x) in packet.h Sven Eckelmann
2017-12-15 18:23 ` [RFC v3 3/4] batman-adv: Convert packet.h to uapi header Sven Eckelmann
2017-12-15 18:23 ` [RFC v3 4/4] flow_dissector: Parse batman-adv unicast headers Sven Eckelmann
2017-12-15 22:51 ` [RFC v3 0/4] flow_dissector: Provide basic batman-adv unicast handling Willem de Bruijn
2017-12-16 8:45 ` [B.A.T.M.A.N.] " Sven Eckelmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171215182313.15767-2-sven.eckelmann@openmesh.com \
--to=sven.eckelmann@openmesh.com \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jiri@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=tom@herbertland.com \
--cc=willemdebruijn.kernel@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®