From: Sven Eckelmann <sven.eckelmann@openmesh.com>
To: netdev@vger.kernel.org
Cc: "David S . Miller" <davem@davemloft.net>,
Jiri Pirko <jiri@mellanox.com>,
Eric Dumazet <edumazet@google.com>,
linux-kernel@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
Sven Eckelmann <sven.eckelmann@openmesh.com>
Subject: [RFC v2 3/6] batman-adv: Let packet.h include its headers directly
Date: Tue, 5 Dec 2017 15:35:11 +0100 [thread overview]
Message-ID: <20171205143514.4441-4-sven.eckelmann@openmesh.com> (raw)
In-Reply-To: <20171205143514.4441-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 69c2ab666961..231bbc47910e 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -219,10 +219,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 ebe0605d1505..0d011012c71a 100644
--- a/net/batman-adv/packet.h
+++ b/net/batman-adv/packet.h
@@ -22,6 +22,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-05 14:35 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-05 14:35 [RFC v2 0/6] flow_dissector: Provide basic batman-adv unicast handling Sven Eckelmann
2017-12-05 14:35 ` Sven Eckelmann [this message]
[not found] ` <20171205143514.4441-1-sven.eckelmann-lv6y7wLVQPlWk0Htik3J/w@public.gmane.org>
2017-12-05 14:35 ` [RFC v2 1/6] batman-adv: Change nl references to genl Sven Eckelmann
2017-12-05 14:35 ` [RFC v2 2/6] batman-adv: Rename batman-adv.h to batadv_genl.h Sven Eckelmann
2017-12-06 16:42 ` Willem de Bruijn
2017-12-06 16:55 ` [B.A.T.M.A.N.] " Sven Eckelmann
2017-12-06 16:58 ` Willem de Bruijn
2017-12-15 10:32 ` [B.A.T.M.A.N.] " Sven Eckelmann
2017-12-15 11:48 ` Sven Eckelmann
2017-12-15 16:57 ` Willem de Bruijn
[not found] ` <CAF=yD-JTfT-iOBG6KMhXv=KggoZ4tEP1fiJMiHMA_d0-wYncLQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-12-15 17:18 ` Sven Eckelmann
2017-12-15 17:23 ` [B.A.T.M.A.N.] " Willem de Bruijn
2017-12-05 14:35 ` [RFC v2 4/6] batman-adv: Remove usage of BIT(x) in packet.h Sven Eckelmann
2017-12-05 14:35 ` [RFC v2 5/6] batman-adv: Convert packet.h to uapi header Sven Eckelmann
2017-12-05 14:35 ` [RFC v2 6/6] flow_dissector: Parse batman-adv unicast headers Sven Eckelmann
2017-12-05 17:19 ` Tom Herbert
2017-12-06 10:26 ` Sven Eckelmann
2017-12-06 16:54 ` Willem de Bruijn
2017-12-06 17:10 ` Tom Herbert
[not found] ` <CAF=yD-LR5WSQt5jwN-+T-1iWyrxovk0qZ1cb-QUO6_+Wy8Ci-A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-12-06 17:27 ` Sven Eckelmann
2017-12-06 18:24 ` Willem de Bruijn
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=20171205143514.4441-4-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 \
/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;
as well as URLs for NNTP newsgroup(s).