From: jacmet at uclibc.org <jacmet@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/package/busybox
Date: Mon, 29 Dec 2008 10:09:51 +0000 (UTC) [thread overview]
Message-ID: <20081229100951.BEB927697D@busybox.osuosl.org> (raw)
Author: jacmet
Date: 2008-12-29 10:09:50 +0000 (Mon, 29 Dec 2008)
New Revision: 24590
Log:
busybox; fix iptunnel compile with 2.6.28 headers (from r24253)
Added:
trunk/buildroot/package/busybox/busybox-1.13.1-iptunnel-fix-problems-with-linux-include.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.13.1-iptunnel-fix-problems-with-linux-include.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.1-iptunnel-fix-problems-with-linux-include.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.1-iptunnel-fix-problems-with-linux-include.patch 2008-12-29 10:09:50 UTC (rev 24590)
@@ -0,0 +1,80 @@
+From 2534c277b4b1c519ec05689eb3525e95d4f6c602 Mon Sep 17 00:00:00 2001
+From: vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>
+Date: Wed, 3 Dec 2008 20:16:11 +0000
+Subject: [PATCH] iptunnel: fix problems with including linux/ip_tunnel.h
+ on some systems
+
+git-svn-id: svn://busybox.net/trunk/busybox at 24253 69ca8d6d-28ef-0310-b511-8ec308f3f277
+---
+ networking/libiproute/iptunnel.c | 45 ++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 43 insertions(+), 2 deletions(-)
+
+diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
+index ab4d65b..5349587 100644
+--- a/networking/libiproute/iptunnel.c
++++ b/networking/libiproute/iptunnel.c
+@@ -6,7 +6,6 @@
+ *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ *
+- *
+ * Changes:
+ *
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+@@ -18,10 +17,52 @@
+ #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"
+--
+1.5.6.5
+
next reply other threads:[~2008-12-29 10:09 UTC|newest]
Thread overview: 161+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-29 10:09 jacmet at uclibc.org [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-03-02 15:33 [Buildroot] svn commit: trunk/buildroot/package/busybox jacmet at uclibc.org
2009-02-18 14:16 jacmet at uclibc.org
2009-02-01 19:36 jacmet at uclibc.org
2009-01-29 11:29 jacmet at uclibc.org
2009-01-29 11:27 jacmet at uclibc.org
2009-01-20 19:26 jacmet at uclibc.org
2009-01-19 12:34 jacmet at uclibc.org
2009-01-12 9:36 jacmet at uclibc.org
2008-12-31 9:35 jacmet at uclibc.org
2008-12-30 19:15 jacmet at uclibc.org
2008-12-11 9:35 jacmet at uclibc.org
2008-12-10 13:46 jacmet at uclibc.org
2008-12-07 21:22 jacmet at uclibc.org
2008-12-04 13:21 jacmet at uclibc.org
2008-11-29 20:12 jacmet at uclibc.org
2008-11-28 8:19 jacmet at uclibc.org
2008-11-22 6:49 jacmet at uclibc.org
2008-11-21 14:36 jacmet at uclibc.org
2008-11-21 10:59 jacmet at uclibc.org
2008-11-20 6:49 jacmet at uclibc.org
2008-11-17 7:40 jacmet at uclibc.org
2008-11-16 17:22 jacmet at uclibc.org
2008-11-16 23:46 ` Hamish Moffatt
2008-11-17 7:13 ` Peter Korsgaard
2008-11-17 12:38 ` Hamish Moffatt
2008-11-17 12:45 ` Peter Korsgaard
2008-11-15 21:25 jacmet at uclibc.org
2008-11-13 16:32 jacmet at uclibc.org
2008-11-14 16:42 ` hartleys
2008-11-15 21:29 ` Peter Korsgaard
2008-11-16 23:42 ` Hamish Moffatt
2008-11-17 7:13 ` Peter Korsgaard
2008-11-13 16:32 jacmet at uclibc.org
2008-11-07 10:16 jacmet at uclibc.org
2008-11-02 13:06 jacmet at uclibc.org
2008-10-13 12:42 jacmet at uclibc.org
2008-10-06 18:52 jacmet at uclibc.org
2008-09-28 19:28 jacmet at uclibc.org
2008-09-22 11:54 jacmet at uclibc.org
2008-09-09 8:50 jacmet at uclibc.org
2008-09-09 8:50 jacmet at uclibc.org
2008-09-10 1:32 ` Hamish Moffatt
2008-09-10 6:57 ` Peter Korsgaard
2008-08-31 21:45 jacmet at uclibc.org
2008-08-28 4:57 jacmet at uclibc.org
2008-08-26 1:05 hamish at uclibc.org
2008-08-21 5:08 jacmet at uclibc.org
2008-08-06 12:56 jacmet at uclibc.org
2008-08-06 6:37 jacmet at uclibc.org
2008-08-04 19:06 jacmet at uclibc.org
2008-07-23 6:01 jacmet at uclibc.org
2008-07-22 11:19 jacmet at uclibc.org
2008-07-11 22:19 jacmet at uclibc.org
2008-07-06 13:55 jacmet at uclibc.org
2008-07-01 14:04 jacmet at uclibc.org
2008-07-01 13:37 jacmet at uclibc.org
2008-06-28 20:53 jacmet at uclibc.org
2008-06-26 6:51 jacmet at uclibc.org
2008-06-26 6:51 jacmet at uclibc.org
2008-06-26 6:58 ` Peter Korsgaard
2008-06-27 9:05 ` Daniel Laird
2008-06-27 9:20 ` Peter Korsgaard
2008-06-27 12:00 ` Bernhard Fischer
2008-06-27 12:46 ` sjhill at realitydiluted.com
2008-06-27 12:53 ` Bernhard Fischer
2008-06-27 14:07 ` Peter Korsgaard
2008-06-27 12:49 ` Daniel Laird
2008-06-27 13:19 ` Peter Korsgaard
2008-06-26 6:51 jacmet at uclibc.org
2008-06-20 18:38 jacmet at uclibc.org
2008-06-13 20:49 jacmet at uclibc.org
2008-06-07 7:46 jacmet at uclibc.org
2008-05-31 12:58 jacmet at uclibc.org
2008-05-31 7:28 jacmet at uclibc.org
2008-05-31 7:39 ` Cristian Ionescu-Idbohrn
2008-05-31 12:59 ` Peter Korsgaard
2008-05-09 10:01 jacmet at uclibc.org
2008-05-05 17:17 jacmet at uclibc.org
2008-04-29 6:53 jacmet at uclibc.org
2008-04-22 9:37 jacmet at uclibc.org
2008-04-04 7:17 jacmet at uclibc.org
2008-04-01 10:00 jacmet at uclibc.org
2008-03-30 14:37 jacmet at uclibc.org
2008-03-26 21:53 jacmet at uclibc.org
2008-03-26 21:49 jacmet at uclibc.org
2008-03-25 14:38 jacmet at uclibc.org
2008-03-21 17:56 ninevoltz at uclibc.org
2008-03-21 10:14 jacmet at uclibc.org
2008-03-17 19:44 jacmet at uclibc.org
2008-03-11 8:17 jacmet at uclibc.org
2008-02-28 14:38 jacmet at uclibc.org
2008-02-14 15:49 jacmet at uclibc.org
2008-02-14 14:45 jacmet at uclibc.org
2008-02-02 21:49 jacmet at uclibc.org
2008-01-08 12:51 jacmet at uclibc.org
2008-01-03 13:33 jacmet at uclibc.org
2008-01-03 13:33 jacmet at uclibc.org
2008-01-03 13:33 jacmet at uclibc.org
2008-01-03 13:33 jacmet at uclibc.org
2008-01-03 13:33 jacmet at uclibc.org
2008-01-03 13:31 jacmet at uclibc.org
2007-09-30 12:50 aldot at uclibc.org
2007-09-30 12:48 aldot at uclibc.org
2007-09-22 17:29 aldot at uclibc.org
2007-09-22 10:25 aldot at uclibc.org
2007-09-20 16:58 aldot at uclibc.org
2007-09-15 18:14 aldot at uclibc.org
2007-09-10 7:38 jacmet at uclibc.org
2007-09-02 22:09 aldot at uclibc.org
2007-09-02 14:56 aldot at uclibc.org
2007-09-01 17:33 aldot at uclibc.org
2007-08-24 14:23 aldot at uclibc.org
2007-07-08 12:10 aldot at uclibc.org
2007-07-08 12:04 aldot at uclibc.org
2007-07-08 11:56 aldot at uclibc.org
2007-07-02 15:20 aldot at uclibc.org
2007-07-02 9:54 aldot at uclibc.org
2007-06-27 21:07 aldot at uclibc.org
2007-06-25 11:07 aldot at uclibc.org
2007-06-14 13:09 jacmet at uclibc.org
2007-06-02 13:13 aldot at uclibc.org
2007-05-15 9:34 aldot at uclibc.org
2007-05-07 4:07 sjhill at uclibc.org
2007-05-07 4:04 sjhill at uclibc.org
2007-04-25 7:11 jacmet at uclibc.org
2007-04-05 7:04 jacmet at uclibc.org
2007-03-24 12:09 aldot at uclibc.org
2007-03-23 13:26 aldot at uclibc.org
2007-03-23 13:24 aldot at uclibc.org
2007-03-20 9:51 aldot at uclibc.org
2007-03-20 8:53 aldot at uclibc.org
2007-03-15 8:36 jacmet at uclibc.org
2007-03-14 13:02 aldot at uclibc.org
2007-02-27 9:04 jacmet at uclibc.org
2007-02-23 11:55 jacmet at uclibc.org
2007-02-16 15:19 aldot at uclibc.org
2007-02-12 14:43 jacmet at uclibc.org
2007-02-06 16:34 jacmet at uclibc.org
2007-02-06 16:31 jacmet at uclibc.org
2007-02-06 16:23 jacmet at uclibc.org
2007-02-06 16:20 jacmet at uclibc.org
2007-02-06 16:18 jacmet at uclibc.org
2007-02-02 16:15 aldot at uclibc.org
2007-02-01 12:30 aldot at uclibc.org
2007-01-31 14:21 aldot at uclibc.org
2007-01-30 16:47 jacmet at uclibc.org
2007-01-30 13:37 jacmet at uclibc.org
2007-01-30 13:36 jacmet at uclibc.org
2006-12-13 6:58 andersen at uclibc.org
2006-12-13 6:18 andersen at uclibc.org
2006-12-07 16:31 aldot at uclibc.org
2006-12-02 19:36 aldot at uclibc.org
2006-12-02 18:36 aldot at uclibc.org
2006-12-02 17:03 aldot at uclibc.org
2006-11-17 12:57 aldot at uclibc.org
2006-11-17 11:37 aldot at uclibc.org
2006-10-25 8:10 jacmet at uclibc.org
2006-08-29 16:45 aldot at uclibc.org
2006-08-24 19:48 aldot at uclibc.org
2006-07-31 9:01 jacmet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081229100951.BEB927697D@busybox.osuosl.org \
--to=jacmet@uclibc.org \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.