aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-12-14 08:00:20 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-12-14 08:00:20 +0000
commit3f9dd11070574ab7990c6e67f43d2092563eef32 (patch)
treefdc768c868311eea092877203f21b7e64764a70f /package
parentd5fbb9666bec8266e57714f0d3472c087cbe9c99 (diff)
downloadupstream-3f9dd11070574ab7990c6e67f43d2092563eef32.tar.gz
upstream-3f9dd11070574ab7990c6e67f43d2092563eef32.tar.bz2
upstream-3f9dd11070574ab7990c6e67f43d2092563eef32.zip
prepare packages for kernel upgrade to 2.6.19
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5786 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/dnsmasq/patches/102-rtnetlink.patch13
-rw-r--r--package/iptables/patches/06-iprange-typesh.patch10
-rw-r--r--package/switch/src/switch-adm.c2
-rw-r--r--package/switch/src/switch-core.c2
-rw-r--r--package/switch/src/switch-robo.c2
5 files changed, 26 insertions, 3 deletions
diff --git a/package/dnsmasq/patches/102-rtnetlink.patch b/package/dnsmasq/patches/102-rtnetlink.patch
new file mode 100644
index 0000000000..03f9917a1b
--- /dev/null
+++ b/package/dnsmasq/patches/102-rtnetlink.patch
@@ -0,0 +1,13 @@
+--- dnsmasq-2.35/src/netlink.c.orig 2006-12-04 23:32:49.000000000 +0100
++++ dnsmasq-2.35/src/netlink.c 2006-12-04 23:33:18.000000000 +0100
+@@ -17,6 +17,10 @@
+ #include <linux/types.h>
+ #include <linux/netlink.h>
+ #include <linux/rtnetlink.h>
++#ifndef IFA_RTA
++# include "linux/if_addr.h"
++# define IFA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
++#endif
+
+ static struct iovec iov;
+
diff --git a/package/iptables/patches/06-iprange-typesh.patch b/package/iptables/patches/06-iprange-typesh.patch
new file mode 100644
index 0000000000..2dc60d44b3
--- /dev/null
+++ b/package/iptables/patches/06-iprange-typesh.patch
@@ -0,0 +1,10 @@
+--- iptables-1.3.5/extensions/libipt_iprange.c.orig 2006-12-05 19:28:58.000000000 +0100
++++ iptables-1.3.5/extensions/libipt_iprange.c 2006-12-05 19:30:28.000000000 +0100
+@@ -6,6 +6,7 @@
+ #include <getopt.h>
+
+ #include <iptables.h>
++#include <linux/types.h>
+ #include <linux/netfilter_ipv4/ipt_iprange.h>
+
+ /* Function which prints out usage message. */
diff --git a/package/switch/src/switch-adm.c b/package/switch/src/switch-adm.c
index beaf9ca787..718096b026 100644
--- a/package/switch/src/switch-adm.c
+++ b/package/switch/src/switch-adm.c
@@ -26,7 +26,7 @@
* 02110-1301, USA.
*/
-#include <linux/config.h>
+#include <linux/autoconf.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/if.h>
diff --git a/package/switch/src/switch-core.c b/package/switch/src/switch-core.c
index 7bf705afe4..c1c9e58d48 100644
--- a/package/switch/src/switch-core.c
+++ b/package/switch/src/switch-core.c
@@ -32,7 +32,7 @@
* ports: same syntax as for nvram's vlan*ports (eg. "1 2 3 4 5*")
*/
-#include <linux/config.h>
+#include <linux/autoconf.h>
#include <linux/module.h>
#include <linux/init.h>
#include <asm/uaccess.h>
diff --git a/package/switch/src/switch-robo.c b/package/switch/src/switch-robo.c
index 32cf2b3960..d46f8ff3f2 100644
--- a/package/switch/src/switch-robo.c
+++ b/package/switch/src/switch-robo.c
@@ -20,7 +20,7 @@
* 02110-1301, USA.
*/
-#include <linux/config.h>
+#include <linux/autoconf.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/if.h>