66 lines
1.7 KiB
Diff
66 lines
1.7 KiB
Diff
From 6423e3e5cdc1f79625dbf90ff6444b0ad8b02185 Mon Sep 17 00:00:00 2001
|
|
From: Alex Suykov <alex.suykov@gmail.com>
|
|
Date: Mon, 6 Apr 2015 17:29:13 +0300
|
|
Subject: [PATCH] batctl: use netinet/if_ether.h instead of linux/if_ether.h
|
|
|
|
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>
|
|
Acked-by: Sven Eckelmann <sven@narfation.org>
|
|
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
|
|
---
|
|
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.1.4
|
|
|