# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1249981032 -7200
# Node ID 40b5fcaccebd944f93fb25578ba25f59bfcd5159
# Parent  22410fa562c70a816ec9720ec84dcd5992e8046e
Busybox: do not use linux/if_tunnel.h anymore

diff -r 22410fa562c7 -r 40b5fcaccebd busybox-pam/receipt
--- a/busybox-pam/receipt	Mon Aug 10 23:39:19 2009 +0200
+++ b/busybox-pam/receipt	Tue Aug 11 10:57:12 2009 +0200
@@ -42,6 +42,7 @@
 dpkg_deb.u
 ionice.u
 syslogd.u
+iptunnel.u
 EOT
     cp $WOK/$SOURCE/stuff/$SOURCE-$VERSION.config .config
     sed -i 's/# CONFIG_PAM is not set/CONFIG_PAM=y/' .config
diff -r 22410fa562c7 -r 40b5fcaccebd busybox/receipt
--- a/busybox/receipt	Mon Aug 10 23:39:19 2009 +0200
+++ b/busybox/receipt	Tue Aug 11 10:57:12 2009 +0200
@@ -40,6 +40,7 @@
 dpkg_deb.u
 ionice.u
 syslogd.u
+iptunnel.u
 EOT
     cp ../stuff/$PACKAGE-$VERSION.config .config
     make oldconfig
diff -r 22410fa562c7 -r 40b5fcaccebd busybox/stuff/busybox-1.12.0-iptunnel.u
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/busybox/stuff/busybox-1.12.0-iptunnel.u	Tue Aug 11 10:57:12 2009 +0200
@@ -0,0 +1,51 @@
+--- busybox-1.12.0/networking/libiproute/iptunnel.c
++++ busybox-1.12.0/networking/libiproute/iptunnel.c
+@@ -21,7 +21,47 @@
+ #ifndef __constant_htons
+ #define __constant_htons htons
+ #endif
+-#include <linux/if_tunnel.h>
++// FYI: #define SIOCDEVPRIVATE 0x89F0
++
++/* From linux/if_tunnel.h. #including it proved troublesome
++ * (redefiniton errors due to name collisions in linux/ and net[inet]/) */
++#define SIOCGETTUNNEL   (SIOCDEVPRIVATE + 0)
++#define SIOCADDTUNNEL   (SIOCDEVPRIVATE + 1)
++#define SIOCDELTUNNEL   (SIOCDEVPRIVATE + 2)
++#define SIOCCHGTUNNEL   (SIOCDEVPRIVATE + 3)
++//#define SIOCGETPRL      (SIOCDEVPRIVATE + 4)
++//#define SIOCADDPRL      (SIOCDEVPRIVATE + 5)
++//#define SIOCDELPRL      (SIOCDEVPRIVATE + 6)
++//#define SIOCCHGPRL      (SIOCDEVPRIVATE + 7)
++#define GRE_CSUM        __constant_htons(0x8000)
++//#define GRE_ROUTING     __constant_htons(0x4000)
++#define GRE_KEY         __constant_htons(0x2000)
++#define GRE_SEQ         __constant_htons(0x1000)
++//#define GRE_STRICT      __constant_htons(0x0800)
++//#define GRE_REC         __constant_htons(0x0700)
++//#define GRE_FLAGS       __constant_htons(0x00F8)
++//#define GRE_VERSION     __constant_htons(0x0007)
++struct ip_tunnel_parm {
++	char            name[IFNAMSIZ];
++	int             link;
++	uint16_t        i_flags;
++	uint16_t        o_flags;
++	uint32_t        i_key;
++	uint32_t        o_key;
++	struct iphdr    iph;
++};
++/* SIT-mode i_flags */
++//#define SIT_ISATAP 0x0001
++//struct ip_tunnel_prl {
++//	uint32_t          addr;
++//	uint16_t          flags;
++//	uint16_t          __reserved;
++//	uint32_t          datalen;
++//	uint32_t          __reserved2;
++//	/* data follows */
++//};
++///* PRL flags */
++//#define PRL_DEFAULT 0x0001
+ 
+ #include "ip_common.h"  /* #include "libbb.h" is inside */
+ #include "rt_names.h"