[kernel] update to 2.6.25.1 and refresh patches

[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.25 / 140-netfilter_time.patch

diff --git a/target/linux/generic-2.6/patches-2.6.25/140-netfilter_time.patch b/target/linux/generic-2.6/patches-2.6.25/140-netfilter_time.patch
index e933bc601b7da3fb76cc5661e0ed8e5e2063d53a..9b1c4478f4d8bafa10be4ab56056838bd9b6cbda 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/140-netfilter_time.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/140-netfilter_time.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23-rc6/include/linux/netfilter_ipv4/ipt_time.h
+Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_time.h
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc6/include/linux/netfilter_ipv4/ipt_time.h   2007-09-21 16:24:02.000000000 +0800
+--- /dev/null
++++ linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_time.h
 @@ -0,0 +1,18 @@
 +#ifndef __ipt_time_h_included__
 +#define __ipt_time_h_included__
@@ -21,10 +21,10 @@ Index: linux-2.6.23-rc6/include/linux/netfilter_ipv4/ipt_time.h
 +
 +
 +#endif /* __ipt_time_h_included__ */
-Index: linux-2.6.23-rc6/net/ipv4/netfilter/ipt_time.c
+Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_time.c
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc6/net/ipv4/netfilter/ipt_time.c     2007-09-21 16:24:02.000000000 +0800
+--- /dev/null
++++ linux-2.6.25.1/net/ipv4/netfilter/ipt_time.c
 @@ -0,0 +1,180 @@
 +/*
 +  This is a module which is used for time matching
@@ -206,13 +206,13 @@ Index: linux-2.6.23-rc6/net/ipv4/netfilter/ipt_time.c
 +      r->tm_mon=i;
 +      r->tm_mday=work-__spm[i]+1;
 +}
-Index: linux-2.6.23-rc6/net/ipv4/netfilter/Kconfig
+Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
 ===================================================================
---- linux-2.6.23-rc6.orig/net/ipv4/netfilter/Kconfig   2007-09-21 16:24:01.000000000 +0800
-+++ linux-2.6.23-rc6/net/ipv4/netfilter/Kconfig        2007-09-21 16:24:02.000000000 +0800
-@@ -96,6 +96,22 @@
- 
-         To compile it as a module, choose M here.  If unsure, say N.
+--- linux-2.6.25.1.orig/net/ipv4/netfilter/Kconfig
++++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig
+@@ -63,6 +63,22 @@ config IP_NF_MATCH_IPP2P
+       help
+         Module for matching traffic of various Peer-to-Peer applications
  
 +
 +config IP_NF_MATCH_TIME
@@ -231,14 +231,14 @@ Index: linux-2.6.23-rc6/net/ipv4/netfilter/Kconfig
 +
 +
  config IP_NF_MATCH_RECENT
-       tristate "recent match support"
+       tristate '"recent" match support'
        depends on IP_NF_IPTABLES
-Index: linux-2.6.23-rc6/net/ipv4/netfilter/Makefile
+Index: linux-2.6.25.1/net/ipv4/netfilter/Makefile
 ===================================================================
---- linux-2.6.23-rc6.orig/net/ipv4/netfilter/Makefile  2007-09-21 16:24:01.000000000 +0800
-+++ linux-2.6.23-rc6/net/ipv4/netfilter/Makefile       2007-09-21 16:24:02.000000000 +0800
-@@ -50,6 +50,7 @@
- obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o
+--- linux-2.6.25.1.orig/net/ipv4/netfilter/Makefile
++++ linux-2.6.25.1/net/ipv4/netfilter/Makefile
+@@ -47,6 +47,7 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn
+ obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
  obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o
 +obj-$(CONFIG_IP_NF_MATCH_TIME) += ipt_time.o