Eliminate most instances where we use linux kernel headers

 -Erik

3 files changed, 19 insertions, 11 deletions

diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
index 3b2f4dac1..1cfaf6d6a 100644
--- a/networking/libiproute/iplink.c
+++ b/networking/libiproute/iplink.c
@@ -18,10 +18,15 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <linux/if.h>
-#include <linux/if_packet.h>
+#include <net/if.h>
+#include <net/if_packet.h>
+#include <netpacket/packet.h>
+
+#if __GLIBC__ >=2 && __GLIBC_MINOR >= 1
+#include <net/ethernet.h>
+#else
 #include <linux/if_ether.h>
-#include <linux/sockios.h>
+#endif
 
 #include "rt_names.h"
 #include "utils.h"
@@ -29,6 +34,10 @@
 
 #include "libbb.h"
 
+
+/* take from linux/sockios.h */
+#define SIOCSIFNAME     0x8923          /* set interface name */
+
 static int do_link;
 
 static int on_off(char *msg)
diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
index dcf717e7e..1eb17799c 100644
--- a/networking/libiproute/iptunnel.c
+++ b/networking/libiproute/iptunnel.c
@@ -25,10 +25,13 @@
 
 #include <arpa/inet.h>
 #include <netinet/ip.h>
+#include <netinet/in.h>
 
-#define sysinfo kernel_sysinfo
-#include <linux/if_arp.h>
-#undef sysinfo
+#include <net/if.h>
+#include <net/if_arp.h>
+
+#include <asm/types.h>
+#define __constant_htons htons
 #include <linux/if_tunnel.h>
 
 #include "rt_names.h"
diff --git a/networking/libiproute/ll_addr.c b/networking/libiproute/ll_addr.c
index 08d5b78f8..39e561fe5 100644
--- a/networking/libiproute/ll_addr.c
+++ b/networking/libiproute/ll_addr.c
@@ -11,11 +11,7 @@
 
 #include <arpa/inet.h>
 #include <string.h>
-
-#define sysinfo kernel_sysinfo
-#include <linux/if_arp.h>
-#undef sysinfo
-
+#include <net/if_arp.h>
 #include "utils.h"
 #include "libbb.h"