aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.25
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-12-06 09:18:20 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-12-06 09:18:20 +0000
commit6316779786db1c6f06cb2830f38ba52d8946727f (patch)
tree2e64f11392db92a6835aec9200bf0af9d52b33a2 /target/linux/generic-2.6/patches-2.6.25
parentfcbd66fef1f3767f22e895d879db0062613c4f7e (diff)
downloadupstream-6316779786db1c6f06cb2830f38ba52d8946727f.tar.gz
upstream-6316779786db1c6f06cb2830f38ba52d8946727f.tar.bz2
upstream-6316779786db1c6f06cb2830f38ba52d8946727f.zip
refresh 2.6.25 patches
SVN-Revision: 13526
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25')
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/130-netfilter_ipset.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/130-netfilter_ipset.patch b/target/linux/generic-2.6/patches-2.6.25/130-netfilter_ipset.patch
index 0dc56a8098..ee9e87d7aa 100644
--- a/target/linux/generic-2.6/patches-2.6.25/130-netfilter_ipset.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/130-netfilter_ipset.patch
@@ -1,7 +1,7 @@
--- a/include/linux/netfilter_ipv4/Kbuild
+++ b/include/linux/netfilter_ipv4/Kbuild
-@@ -45,3 +45,14 @@
-
+@@ -45,3 +45,14 @@ header-y += ipt_ttl.h
+
unifdef-y += ip_queue.h
unifdef-y += ip_tables.h
+
diff --git a/target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch b/target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch
index 0d1fb57739..76945198de 100644
--- a/target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch
@@ -1,6 +1,6 @@
--- a/include/linux/netfilter/Kbuild
+++ b/include/linux/netfilter/Kbuild
-@@ -3,6 +3,7 @@
+@@ -3,6 +3,7 @@ header-y += nf_conntrack_tuple_common.h
header-y += nfnetlink_conntrack.h
header-y += nfnetlink_log.h
header-y += nfnetlink_queue.h