From 63d865e7a157da78888f19552c1604e7be297c61 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 14 Dec 2006 08:00:20 +0000
Subject: [PATCH] prepare packages for kernel upgrade to 2.6.19

SVN-Revision: 5786
---
 package/dnsmasq/patches/102-rtnetlink.patch      | 13 +++++++++++++
 package/iptables/patches/06-iprange-typesh.patch | 10 ++++++++++
 package/switch/src/switch-adm.c                  |  2 +-
 package/switch/src/switch-core.c                 |  2 +-
 package/switch/src/switch-robo.c                 |  2 +-
 5 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 package/dnsmasq/patches/102-rtnetlink.patch
 create mode 100644 package/iptables/patches/06-iprange-typesh.patch

diff --git a/package/dnsmasq/patches/102-rtnetlink.patch b/package/dnsmasq/patches/102-rtnetlink.patch
new file mode 100644
index 00000000000..03f9917a1bc
--- /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 00000000000..2dc60d44b34
--- /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 beaf9ca7873..718096b0264 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 7bf705afe47..c1c9e58d480 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 32cf2b39603..d46f8ff3f2a 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>
-- 
2.30.2