From: Jo-Philipp Wich Date: Sun, 17 May 2009 00:34:17 +0000 (+0000) Subject: refresh 621-netfilter_random.patch for kernel 2.4 (#5140) X-Git-Tag: 8.09.1~51 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=96faa51fc583c5d5cb96c33c9c33fc7c0e88c429;p=openwrt%2Fsvn-archive%2Fopenwrt.git refresh 621-netfilter_random.patch for kernel 2.4 (#5140) SVN-Revision: 15882 --- diff --git a/target/linux/generic-2.4/patches/621-netfilter_random.patch b/target/linux/generic-2.4/patches/621-netfilter_random.patch index 506516eb2d..ebbabff5f8 100644 --- a/target/linux/generic-2.4/patches/621-netfilter_random.patch +++ b/target/linux/generic-2.4/patches/621-netfilter_random.patch @@ -1,8 +1,6 @@ -Index: linux-2.4.35.4/Documentation/Configure.help -=================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help -+++ linux-2.4.35.4/Documentation/Configure.help -@@ -2914,6 +2914,15 @@ CONFIG_IP_NF_MATCH_MAC +--- a/Documentation/Configure.help ++++ b/Documentation/Configure.help +@@ -2914,6 +2914,15 @@ If you want to compile it as a module, say M here and read . If unsure, say `N'. @@ -18,7 +16,7 @@ Index: linux-2.4.35.4/Documentation/Configure.help Netfilter MARK match support CONFIG_IP_NF_MATCH_MARK Netfilter mark matching allows you to match packets based on the -@@ -3229,6 +3238,7 @@ CONFIG_IP_NF_MATCH_HELPER +@@ -3229,6 +3238,7 @@ If you want to compile it as a module, say M here and read Documentation/modules.txt. If unsure, say `Y'. @@ -26,7 +24,7 @@ Index: linux-2.4.35.4/Documentation/Configure.help TCPMSS match support CONFIG_IP_NF_MATCH_TCPMSS This option adds a `tcpmss' match, which allows you to examine the -@@ -3376,6 +3386,14 @@ CONFIG_IP6_NF_MATCH_MAC +@@ -3376,6 +3386,14 @@ If you want to compile it as a module, say M here and read . If unsure, say `N'. @@ -41,10 +39,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help length match support CONFIG_IP6_NF_MATCH_LENGTH This option allows you to match the length of a packet against a -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_random.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_random.h ++++ b/include/linux/netfilter_ipv4/ipt_random.h @@ -0,0 +1,11 @@ +#ifndef _IPT_RAND_H +#define _IPT_RAND_H @@ -57,10 +53,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_random.h +}; + +#endif /*_IPT_RAND_H*/ -Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.h ++++ b/include/linux/netfilter_ipv6/ip6t_random.h @@ -0,0 +1,11 @@ +#ifndef _IP6T_RAND_H +#define _IP6T_RAND_H @@ -73,22 +67,18 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.h +}; + +#endif /*_IP6T_RAND_H*/ -Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in -@@ -48,6 +48,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; +--- a/net/ipv4/netfilter/Config.in ++++ b/net/ipv4/netfilter/Config.in +@@ -48,6 +48,7 @@ dep_tristate ' netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES dep_tristate ' Multiple port match support' CONFIG_IP_NF_MATCH_MULTIPORT $CONFIG_IP_NF_IPTABLES dep_tristate ' TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES + dep_tristate ' random match support' CONFIG_IP_NF_MATCH_RANDOM $CONFIG_IP_NF_IPTABLES - dep_tristate ' TIME match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_TIME $CONFIG_IP_NF_IPTABLES dep_tristate ' condition match support' CONFIG_IP_NF_MATCH_CONDITION $CONFIG_IP_NF_IPTABLES dep_tristate ' recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES -Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c -=================================================================== + dep_tristate ' ECN match support' CONFIG_IP_NF_MATCH_ECN $CONFIG_IP_NF_IPTABLES --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c ++++ b/net/ipv4/netfilter/ipt_random.c @@ -0,0 +1,96 @@ +/* + This is a module which is used for a "random" match support. @@ -186,12 +176,10 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile -@@ -115,6 +115,8 @@ obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos - obj-$(CONFIG_IP_NF_MATCH_TIME) += ipt_time.o +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile +@@ -114,6 +114,8 @@ + obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o obj-$(CONFIG_IP_NF_MATCH_CONDITION) += ipt_condition.o +obj-$(CONFIG_IP_NF_MATCH_RANDOM) += ipt_random.o @@ -199,11 +187,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o -Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv6/netfilter/Config.in -@@ -19,6 +19,7 @@ if [ "$CONFIG_IP6_NF_IPTABLES" != "n" ]; +--- a/net/ipv6/netfilter/Config.in ++++ b/net/ipv6/netfilter/Config.in +@@ -19,6 +19,7 @@ dep_tristate ' limit match support' CONFIG_IP6_NF_MATCH_LIMIT $CONFIG_IP6_NF_IPTABLES dep_tristate ' condition match support' CONFIG_IP6_NF_MATCH_CONDITION $CONFIG_IP6_NF_IPTABLES dep_tristate ' MAC address match support' CONFIG_IP6_NF_MATCH_MAC $CONFIG_IP6_NF_IPTABLES @@ -211,10 +197,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then dep_tristate ' Routing header match support (EXPERIMENTAL)' CONFIG_IP6_NF_MATCH_RT $CONFIG_IP6_NF_IPTABLES fi -Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c ++++ b/net/ipv6/netfilter/ip6t_random.c @@ -0,0 +1,97 @@ +/* + This is a module which is used for a "random" match support. @@ -313,11 +297,9 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv6/netfilter/Makefile -@@ -32,6 +32,7 @@ obj-$(CONFIG_IP6_NF_TARGET_MARK) += ip6t +--- a/net/ipv6/netfilter/Makefile ++++ b/net/ipv6/netfilter/Makefile +@@ -32,6 +32,7 @@ obj-$(CONFIG_IP6_NF_TARGET_IMQ) += ip6t_IMQ.o obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o