From: Alex Suykov <alex.suykov@gmail.com>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH v2 2/2] batctl: use netinet/if_ether.h instead of linux/if_ether.h
Date: Mon, 6 Apr 2015 17:29:13 +0300 [thread overview]
Message-ID: <0516b7e4ce841146f759473be197ce252878f8ec.1428329893.git.alex.suykov@gmail.com> (raw)
In-Reply-To: <cover.1428329893.git.alex.suykov@gmail.com>
musl does not allow including netinet/* and linux/* headers together.
batctl includes netinet/if_ether.h indirectly via net/ethernet.h,
so netinet/if_ether.h must be used instead of linux/if_ether.h.
Signed-off-by: Alex Suykov <alex.suykov at gmail.com>
---
v2: updated to work with #include <linux/types.h> in packet.h introduced by
https://lists.open-mesh.org:443/pipermail/b.a.t.m.a.n/2015-April/012961.html
and ported to batctl by patch 1/2 in this set.
ping.c | 2 +-
tcpdump.h | 2 +-
traceroute.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ping.c b/ping.c
index bdca222..7880a82 100644
--- a/ping.c
+++ b/ping.c
@@ -34,7 +34,7 @@
#include <stdint.h>
#include <sys/select.h>
#include <sys/time.h>
-#include <linux/if_ether.h>
+#include <netinet/if_ether.h>
#include "main.h"
#include "ping.h"
diff --git a/tcpdump.h b/tcpdump.h
index 5d936f2..3c9126c 100644
--- a/tcpdump.h
+++ b/tcpdump.h
@@ -23,7 +23,7 @@
#define _BATCTL_TCPDUMP_H
#include <netpacket/packet.h>
-#include <linux/if_ether.h>
+#include <netinet/if_ether.h>
#include <net/if_arp.h>
#include <sys/types.h>
#include "main.h"
diff --git a/traceroute.c b/traceroute.c
index 4ebfec2..373fe90 100644
--- a/traceroute.c
+++ b/traceroute.c
@@ -22,13 +22,13 @@
#include <netinet/in.h>
+#include <netinet/if_ether.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
#include <string.h>
-#include <linux/if_ether.h>
#include <stddef.h>
#include <sys/select.h>
#include <sys/time.h>
--
2.0.3
next prev parent reply other threads:[~2015-04-06 14:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-06 14:28 [B.A.T.M.A.N.] [PATCH v2 0/2] batctl: musl build fixes Alex Suykov
2015-04-06 14:28 ` [B.A.T.M.A.N.] [PATCH v2 1/2] batctl: update packet.h to match batman-adv Alex Suykov
2015-04-20 7:28 ` Sven Eckelmann
2015-04-06 14:29 ` Alex Suykov [this message]
2015-04-20 7:27 ` [B.A.T.M.A.N.] [PATCH v2 2/2] batctl: use netinet/if_ether.h instead of linux/if_ether.h Sven Eckelmann
2015-04-21 4:06 ` Marek Lindner
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=0516b7e4ce841146f759473be197ce252878f8ec.1428329893.git.alex.suykov@gmail.com \
--to=alex.suykov@gmail.com \
--cc=b.a.t.m.a.n@lists.open-mesh.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).