aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-05-30 16:30:51 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-05-30 16:30:51 +0000
commitf664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce (patch)
treeeee31435ae91d4838abf2a566762712522a30f1f /target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch
parent83072a149a7d7e6faf7276db7a5f6440d7fa0d24 (diff)
downloadupstream-f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce.tar.gz
upstream-f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce.tar.bz2
upstream-f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce.zip
refresh generic 2.6.25 patches to match upstream style
SVN-Revision: 11296
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch20
1 files changed, 7 insertions, 13 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch b/target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch
index 7add5f5b93..8575368699 100644
--- a/target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch
@@ -1,8 +1,6 @@
-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
-@@ -437,6 +437,23 @@ config NETFILTER_XT_TARGET_CONNSECMARK
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -437,6 +437,23 @@
To compile it as a module, choose M here. If unsure, say N.
@@ -26,11 +24,9 @@ Index: linux-2.6.25.4/net/netfilter/Kconfig
config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support'
depends on NETFILTER_XTABLES && (IPV6 || IPV6=n)
-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
-@@ -47,6 +47,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE
+--- a/net/netfilter/Makefile
++++ b/net/netfilter/Makefile
+@@ -47,6 +47,7 @@
obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o
obj-$(CONFIG_NETFILTER_XT_TARGET_RATEEST) += xt_RATEEST.o
obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o
@@ -38,10 +34,8 @@ Index: linux-2.6.25.4/net/netfilter/Makefile
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
-Index: linux-2.6.25.4/net/netfilter/xt_TARPIT.c
-===================================================================
--- /dev/null
-+++ linux-2.6.25.4/net/netfilter/xt_TARPIT.c
++++ b/net/netfilter/xt_TARPIT.c
@@ -0,0 +1,279 @@
+/*
+ * Kernel module to capture and hold incoming TCP connections using