From 0ec45ff59636032156ccdcc3cc54c1862af1e7b2 Mon Sep 17 00:00:00 2001 From: agb Date: Fri, 15 May 2009 10:36:04 +0000 Subject: [kernel] generic-2.4: refresh patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15860 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../generic-2.4/patches/606-netfilter_NETMAP.patch | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'target/linux/generic-2.4/patches/606-netfilter_NETMAP.patch') diff --git a/target/linux/generic-2.4/patches/606-netfilter_NETMAP.patch b/target/linux/generic-2.4/patches/606-netfilter_NETMAP.patch index c0e3cfaa9..f7be0727e 100644 --- a/target/linux/generic-2.4/patches/606-netfilter_NETMAP.patch +++ b/target/linux/generic-2.4/patches/606-netfilter_NETMAP.patch @@ -1,7 +1,5 @@ -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 +--- a/Documentation/Configure.help ++++ b/Documentation/Configure.help @@ -3086,6 +3086,17 @@ CONFIG_IP_NF_TARGET_REDIRECT If you want to compile it as a module, say M here and read . If unsure, say `N'. @@ -20,10 +18,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help Packet mangling CONFIG_IP_NF_MANGLE This option adds a `mangle' table to iptables: see the man page for -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 +--- a/net/ipv4/netfilter/Config.in ++++ b/net/ipv4/netfilter/Config.in @@ -65,6 +65,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; define_bool CONFIG_IP_NF_NAT_NEEDED y dep_tristate ' MASQUERADE target support' CONFIG_IP_NF_TARGET_MASQUERADE $CONFIG_IP_NF_NAT @@ -32,10 +28,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in if [ "$CONFIG_IP_NF_PPTP" = "m" ]; then define_tristate CONFIG_IP_NF_NAT_PPTP m else -Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_NETMAP.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_NETMAP.c ++++ b/net/ipv4/netfilter/ipt_NETMAP.c @@ -0,0 +1,112 @@ +/* NETMAP - static NAT mapping of IP network addresses (1:1). + The mapping can be applied to source (POSTROUTING), @@ -149,10 +143,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_NETMAP.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 +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile @@ -107,6 +107,7 @@ obj-$(CONFIG_IP_NF_TARGET_DSCP) += ipt_D obj-$(CONFIG_IP_NF_TARGET_MARK) += ipt_MARK.o obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o -- cgit v1.2.3