changeset 557:8113ea4c3ee9

Ugly, overcomplicated fix for building busybox with 2.6.28 kernel headers, but it's what they committed to svn, so...
author Rob Landley <rob@landley.net>
date Sun, 28 Dec 2008 02:38:00 -0600
parents 3a60fac0781c
children f806ebb91b0b
files sources/patches/busybox-1.13.1-2.6.28.patch
diffstat 1 files changed, 77 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sources/patches/busybox-1.13.1-2.6.28.patch	Sun Dec 28 02:38:00 2008 -0600
@@ -0,0 +1,77 @@
+ ------------------------------------------------------------------------
+r24253 | vda | 2008-12-03 14:16:11 -0600 (Wed, 03 Dec 2008) | 4 lines
+Changed paths:
+   M /trunk/busybox/networking/libiproute/iptunnel.c
+
+iptunnel: fix problems with including linux/ip_tunnel.h
+ on some systems
+
+
+ ------------------------------------------------------------------------
+Index: networking/libiproute/iptunnel.c
+===================================================================
+--- a/networking/libiproute/iptunnel.c	(revision 24252)
++++ b/networking/libiproute/iptunnel.c	(revision 24253)
+@@ -6,7 +6,6 @@
+  *
+  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+  *
+- *
+  * Changes:
+  *
+  * Rani Assaf <rani@magic.metawire.com> 980929:	resolve addresses
+@@ -18,11 +17,53 @@
+ #include <net/if.h>
+ #include <net/if_arp.h>
+ #include <asm/types.h>
++
+ #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"
+ #include "utils.h"