[BusyBox-cvs] busybox/networking/libiproute iplink.c,1.5,1.6 iptunnel.c,1.4,1.5 ll_addr.c,1.4,1.5

[Erik Andersen]

Update of /var/cvs/busybox/networking/libiproute
In directory winder:/tmp/cvs-serv12906/networking/libiproute

Modified Files:
	iplink.c iptunnel.c ll_addr.c 
Log Message:
Eliminate most instances where we use linux kernel headers
 -Erik


Index: iplink.c
===================================================================
RCS file: /var/cvs/busybox/networking/libiproute/iplink.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- iplink.c	13 Jan 2003 21:40:38 -0000	1.5
+++ iplink.c	14 Jan 2003 08:54:08 -0000	1.6
@@ -18,16 +18,25 @@
 #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"
 #include "ip_common.h"
 
 #include "libbb.h"
+
+
+/* take from linux/sockios.h */
+#define SIOCSIFNAME	0x8923		/* set interface name */
 
 static int do_link;
 

Index: iptunnel.c
===================================================================
RCS file: /var/cvs/busybox/networking/libiproute/iptunnel.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- iptunnel.c	5 Jan 2003 00:43:00 -0000	1.4
+++ iptunnel.c	14 Jan 2003 08:54:08 -0000	1.5
@@ -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"

Index: ll_addr.c
===================================================================
RCS file: /var/cvs/busybox/networking/libiproute/ll_addr.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ll_addr.c	5 Jan 2003 00:43:00 -0000	1.4
+++ ll_addr.c	14 Jan 2003 08:54:08 -0000	1.5
@@ -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"