[netfilter-cvslog] r6565 - in trunk/patch-o-matic-ng/patchlets/ROUTE: . linux-2.6/net/ipv4/netfilter linux-2.6/net/ipv6/netfilter

[kaber at netfilter.org]

Author: kaber at netfilter.org
Date: 2006-03-29 11:04:42 +0200 (Wed, 29 Mar 2006)
New Revision: 6565

Removed:
   trunk/patch-o-matic-ng/patchlets/ROUTE/linux-2.6.11/
Modified:
   trunk/patch-o-matic-ng/patchlets/ROUTE/linux-2.6/net/ipv4/netfilter/ipt_ROUTE.c
   trunk/patch-o-matic-ng/patchlets/ROUTE/linux-2.6/net/ipv6/netfilter/Makefile.ladd
Log:
[POM-NG 3/10] Fix the ROUTE extension for 2.6.16 kernels

This patch allows the ROUTE extension to be used with 2.6.16 kernels.
It also removes additional instances of patches for older 2.6.x kernels
as per decision to keep in pom-ng only patches for the most recent kernels.

Signed-off-by: Krzysztof Piotr Oledzki <ole at ans.pl>


Modified: trunk/patch-o-matic-ng/patchlets/ROUTE/linux-2.6/net/ipv4/netfilter/ipt_ROUTE.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/ROUTE/linux-2.6/net/ipv4/netfilter/ipt_ROUTE.c	2006-03-29 09:01:49 UTC (rev 6564)
+++ trunk/patch-o-matic-ng/patchlets/ROUTE/linux-2.6/net/ipv4/netfilter/ipt_ROUTE.c	2006-03-29 09:04:42 UTC (rev 6565)
@@ -17,6 +17,7 @@
 #include <linux/netfilter_ipv4/ipt_ROUTE.h>
 #include <linux/netdevice.h>
 #include <linux/route.h>
+#include <linux/if_arp.h>
 #include <net/ip.h>
 #include <net/route.h>
 #include <net/icmp.h>
@@ -377,7 +378,6 @@
 		skb->nfct = &route_tee_track.ct_general;
 		skb->nfctinfo = IP_CT_NEW;
 		nf_conntrack_get(skb->nfct);
-		skb->nfcache = 0;
 #ifdef CONFIG_NETFILTER_DEBUG
 		skb->nf_debug = 0;
 #endif
@@ -403,7 +403,7 @@
 
 
 static int ipt_route_checkentry(const char *tablename,
-				const struct ipt_entry *e,
+				const void *e,
 				void *targinfo,
 				unsigned int targinfosize,
 				unsigned int hook_mask)
@@ -449,8 +449,7 @@
 	/*  - and look it like as a confirmed connection */
 	set_bit(IPS_CONFIRMED_BIT, &route_tee_track.status);
 	/* Initialize fake conntrack so that NAT will skip it */
-	route_tee_track.nat.info.initialized |= 
-		(1 << IP_NAT_MANIP_SRC) | (1 << IP_NAT_MANIP_DST);
+	route_tee_track.status |= IPS_NAT_DONE_MASK;
 
 	return ipt_register_target(&ipt_route_reg);
 }

Modified: trunk/patch-o-matic-ng/patchlets/ROUTE/linux-2.6/net/ipv6/netfilter/Makefile.ladd
===================================================================
--- trunk/patch-o-matic-ng/patchlets/ROUTE/linux-2.6/net/ipv6/netfilter/Makefile.ladd	2006-03-29 09:01:49 UTC (rev 6564)
+++ trunk/patch-o-matic-ng/patchlets/ROUTE/linux-2.6/net/ipv6/netfilter/Makefile.ladd	2006-03-29 09:04:42 UTC (rev 6565)
@@ -1,2 +1,2 @@
-obj-$(CONFIG_IP6_NF_TARGET_MARK) += ip6t_MARK.o
+obj-$(CONFIG_IP6_NF_TARGET_REJECT) += ip6t_REJECT.o
 obj-$(CONFIG_IP6_NF_TARGET_ROUTE) += ip6t_ROUTE.o