diff options
author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-30 16:30:51 +0000 |
---|---|---|
committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-30 16:30:51 +0000 |
commit | 48983d35d70395a391026c8f8bb1f44165ce058e (patch) | |
tree | 5e3bc42552316a5cdaf8eee331305ff7b55c7bad /target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch | |
parent | 1854938e6ee49ce15d9d11e555f1a12a2e46a6fd (diff) |
refresh generic 2.6.25 patches to match upstream style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11296 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch | 62 |
1 files changed, 20 insertions, 42 deletions
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 3acc1aadb0..d059973f2f 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,17 +1,13 @@ -Index: linux-2.6.25.4/include/linux/netfilter/oot_conntrack.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter/oot_conntrack.h ++++ b/include/linux/netfilter/oot_conntrack.h @@ -0,0 +1,5 @@ +#if defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE) +# include <linux/netfilter_ipv4/ip_conntrack.h> +#else /* linux-2.6.20+ */ +# include <net/netfilter/nf_nat_rule.h> +#endif -Index: linux-2.6.25.4/include/linux/netfilter/oot_trans.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter/oot_trans.h ++++ b/include/linux/netfilter/oot_trans.h @@ -0,0 +1,14 @@ +/* Out of tree workarounds */ +#include <linux/version.h> @@ -27,10 +23,8 @@ Index: linux-2.6.25.4/include/linux/netfilter/oot_trans.h +# define tcp_v4_check(tcph, tcph_sz, s, d, csp) \ + tcp_v4_check((tcph_sz), (s), (d), (csp)) +#endif -Index: linux-2.6.25.4/include/linux/netfilter/xt_CHAOS.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter/xt_CHAOS.h ++++ b/include/linux/netfilter/xt_CHAOS.h @@ -0,0 +1,14 @@ +#ifndef _LINUX_NETFILTER_XT_CHAOS_H +#define _LINUX_NETFILTER_XT_CHAOS_H 1 @@ -46,10 +40,8 @@ Index: linux-2.6.25.4/include/linux/netfilter/xt_CHAOS.h +}; + +#endif /* _LINUX_NETFILTER_XT_CHAOS_H */ -Index: linux-2.6.25.4/include/linux/netfilter/xt_portscan.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter/xt_portscan.h ++++ b/include/linux/netfilter/xt_portscan.h @@ -0,0 +1,8 @@ +#ifndef _LINUX_NETFILTER_XT_PORTSCAN_H +#define _LINUX_NETFILTER_XT_PORTSCAN_H 1 @@ -59,10 +51,8 @@ Index: linux-2.6.25.4/include/linux/netfilter/xt_portscan.h +}; + +#endif /* _LINUX_NETFILTER_XT_PORTSCAN_H */ -Index: linux-2.6.25.4/net/netfilter/find_match.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/netfilter/find_match.c ++++ b/net/netfilter/find_match.c @@ -0,0 +1,39 @@ +/* + xt_request_find_match @@ -103,11 +93,9 @@ Index: linux-2.6.25.4/net/netfilter/find_match.c + +/* In case it goes into mainline, let this out-of-tree package compile */ +#define xt_request_find_match xt_request_find_match_lo -Index: linux-2.6.25.4/net/netfilter/Kconfig -=================================================================== ---- linux-2.6.25.4.orig/net/netfilter/Kconfig -+++ linux-2.6.25.4/net/netfilter/Kconfig -@@ -276,6 +276,14 @@ config NETFILTER_XTABLES +--- a/net/netfilter/Kconfig ++++ b/net/netfilter/Kconfig +@@ -276,6 +276,14 @@ # alphabetically ordered list of targets @@ -122,7 +110,7 @@ Index: linux-2.6.25.4/net/netfilter/Kconfig config NETFILTER_XT_TARGET_CLASSIFY tristate '"CLASSIFY" target support' depends on NETFILTER_XTABLES -@@ -305,6 +313,14 @@ config NETFILTER_XT_TARGET_CONNMARK +@@ -305,6 +313,14 @@ <file:Documentation/kbuild/modules.txt>. The module will be called ipt_CONNMARK.ko. If unsure, say `N'. @@ -137,7 +125,7 @@ Index: linux-2.6.25.4/net/netfilter/Kconfig config NETFILTER_XT_TARGET_DSCP tristate '"DSCP" and "TOS" target support' depends on NETFILTER_XTABLES -@@ -640,6 +656,14 @@ config NETFILTER_XT_MATCH_POLICY +@@ -640,6 +656,14 @@ To compile it as a module, choose M here. If unsure, say N. @@ -152,11 +140,9 @@ Index: linux-2.6.25.4/net/netfilter/Kconfig config NETFILTER_XT_MATCH_MULTIPORT tristate '"multiport" Multiple port match support' depends on NETFILTER_XTABLES -Index: linux-2.6.25.4/net/netfilter/Makefile -=================================================================== ---- linux-2.6.25.4.orig/net/netfilter/Makefile -+++ linux-2.6.25.4/net/netfilter/Makefile -@@ -50,6 +50,8 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK +--- a/net/netfilter/Makefile ++++ b/net/netfilter/Makefile +@@ -50,6 +50,8 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o obj-$(CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP) += xt_TCPOPTSTRIP.o obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o @@ -165,15 +151,13 @@ Index: linux-2.6.25.4/net/netfilter/Makefile # matches obj-$(CONFIG_NETFILTER_XT_MATCH_COMMENT) += xt_comment.o -@@ -83,3 +85,4 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) +@@ -83,3 +85,4 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o obj-$(CONFIG_NETFILTER_XT_MATCH_U32) += xt_u32.o +obj-$(CONFIG_NETFILTER_XT_MATCH_PORTSCAN) += xt_portscan.o -Index: linux-2.6.25.4/net/netfilter/xt_CHAOS.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/netfilter/xt_CHAOS.c ++++ b/net/netfilter/xt_CHAOS.c @@ -0,0 +1,200 @@ +/* + * CHAOS target for netfilter @@ -375,10 +359,8 @@ Index: linux-2.6.25.4/net/netfilter/xt_CHAOS.c +MODULE_DESCRIPTION("netfilter \"CHAOS\" target"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("ipt_CHAOS"); -Index: linux-2.6.25.4/net/netfilter/xt_DELUDE.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/netfilter/xt_DELUDE.c ++++ b/net/netfilter/xt_DELUDE.c @@ -0,0 +1,197 @@ +/* + * DELUDE target @@ -577,10 +559,8 @@ Index: linux-2.6.25.4/net/netfilter/xt_DELUDE.c +MODULE_DESCRIPTION("netfilter \"DELUDE\" target"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("ipt_DELUDE"); -Index: linux-2.6.25.4/net/netfilter/xt_portscan.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/netfilter/xt_portscan.c ++++ b/net/netfilter/xt_portscan.c @@ -0,0 +1,269 @@ +/* + * portscan match for netfilter @@ -851,11 +831,9 @@ Index: linux-2.6.25.4/net/netfilter/xt_portscan.c +MODULE_DESCRIPTION("netfilter \"portscan\" match"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("ipt_portscan"); -Index: linux-2.6.25.4/drivers/char/random.c -=================================================================== ---- linux-2.6.25.4.orig/drivers/char/random.c -+++ linux-2.6.25.4/drivers/char/random.c -@@ -1563,6 +1563,8 @@ __u32 secure_tcp_sequence_number(__be32 +--- a/drivers/char/random.c ++++ b/drivers/char/random.c +@@ -1563,6 +1563,8 @@ return seq; } |