[netfilter-cvslog] r4111 - 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-10 22:44:47 +0200 (Sun, 10 Jul 2005)
New Revision: 4111

Removed:
   trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_6
Modified:
   trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_2
Log:
merge two .ladd files to fix #include order and make it compile


Modified: trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_2
===================================================================
--- trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_2	2005-07-10 15:15:49 UTC (rev 4110)
+++ trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_2	2005-07-10 20:44:47 UTC (rev 4111)
@@ -1,2 +1,8 @@
 #include <linux/netfilter_ipv4/ip_nat.h>
 #include <linux/netfilter_ipv4/ip_nat_pptp.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;
+};

Deleted: 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-10 15:15:49 UTC (rev 4110)
+++ trunk/patch-o-matic-ng/patchlets/pptp-conntrack-nat/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_6	2005-07-10 20:44:47 UTC (rev 4111)
@@ -1,7 +0,0 @@
-#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;
-};