[netfilter-cvslog] r4094 - trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11/include/linux/netfilter_ipv4

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-07-04 20:48:39 +0200 (Mon, 04 Jul 2005)
New Revision: 4094

Modified:
   trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_6
   trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_8
Log:
update to new 2.6.11+ headers


Modified: trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_6
===================================================================
--- trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_6	2005-07-04 18:44:44 UTC (rev 4093)
+++ trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_6	2005-07-04 18:48:39 UTC (rev 4094)
@@ -1,2 +1,7 @@
+#include <linux/netfilter_ipv4/ip_nat.h>
+
+/* per conntrack: nat application helper private data */
+union ip_conntrack_nat_help {
 	/* insert nat helper private data here */
 	struct ip_nat_pptp nat_pptp_info;
+};

Modified: trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_8
===================================================================
--- trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_8	2005-07-04 18:44:44 UTC (rev 4093)
+++ trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_8	2005-07-04 18:48:39 UTC (rev 4094)
@@ -1,2 +1,2 @@
-	/* insert conntrack helper private data (expect) here */
-	struct ip_ct_pptp_expect exp_pptp_info;
+		struct ip_nat_info info;
+		union ip_conntrack_nat_help help;