[netfilter-cvslog] r3815 - in trunk/patch-o-matic-ng/ROUTE: . linux-2.6.11/net/ipv4/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-04-01 08:50:41 +0200 (Fri, 01 Apr 2005)
New Revision: 3815

Added:
   trunk/patch-o-matic-ng/ROUTE/linux-2.6.11.patch
   trunk/patch-o-matic-ng/ROUTE/linux-2.6.11/
Modified:
   trunk/patch-o-matic-ng/ROUTE/linux-2.6.11/net/ipv4/netfilter/ipt_ROUTE.c
Log:
make 2.6.11 branch


Copied: trunk/patch-o-matic-ng/ROUTE/linux-2.6.11 (from rev 3808, trunk/patch-o-matic-ng/ROUTE/linux-2.6)

Modified: trunk/patch-o-matic-ng/ROUTE/linux-2.6.11/net/ipv4/netfilter/ipt_ROUTE.c
===================================================================
--- trunk/patch-o-matic-ng/ROUTE/linux-2.6/net/ipv4/netfilter/ipt_ROUTE.c	2005-03-29 09:01:10 UTC (rev 3808)
+++ trunk/patch-o-matic-ng/ROUTE/linux-2.6.11/net/ipv4/netfilter/ipt_ROUTE.c	2005-04-01 06:50:41 UTC (rev 3815)
@@ -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);
 }

Copied: trunk/patch-o-matic-ng/ROUTE/linux-2.6.11.patch (from rev 3810, trunk/patch-o-matic-ng/ROUTE/linux-2.6.patch)