SOURCES (LINUX_2_6): kernel-pom-ng-ROUTE.patch - ip_conntrack -> n...

[mguevara]

Author: mguevara                     Date: Fri Aug 10 01:26:48 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- ip_conntrack -> nf_conn

---- Files affected:
SOURCES:
   kernel-pom-ng-ROUTE.patch (1.1.2.4 -> 1.1.2.5) 

---- Diffs:

================================================================
Index: SOURCES/kernel-pom-ng-ROUTE.patch
diff -u SOURCES/kernel-pom-ng-ROUTE.patch:1.1.2.4 SOURCES/kernel-pom-ng-ROUTE.patch:1.1.2.5
--- SOURCES/kernel-pom-ng-ROUTE.patch:1.1.2.4	Fri Aug 10 02:23:36 2007
+++ SOURCES/kernel-pom-ng-ROUTE.patch	Fri Aug 10 03:26:43 2007
@@ -109,7 +109,7 @@
 +#include <linux/ip.h>
 +#include <linux/netfilter/x_tables.h>
 +#include <linux/netfilter_ipv4/ip_tables.h>
-+#include <linux/netfilter_ipv4/ip_conntrack.h>
++#include <net/netfilter/nf_conntrack.h>
 +#include <linux/netfilter_ipv4/ipt_ROUTE.h>
 +#include <linux/netdevice.h>
 +#include <linux/route.h>
@@ -363,7 +363,7 @@
 + * routing packets when we see they already have that ->nfct.
 + */
 +
-+static struct ip_conntrack route_tee_track;
++static struct nf_conn route_tee_track;
 +
 +static unsigned int ipt_route_target(struct sk_buff **pskb,
 +				     const struct net_device *in,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-pom-ng-ROUTE.patch?r1=1.1.2.4&r2=1.1.2.5&f=u