[netfilter-cvslog] r3969 - trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-06-10 21:12:01 +0200 (Fri, 10 Jun 2005)
New Revision: 3969

Modified:
   trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/ip_conntrack_pptp.c
Log:
use expect_put() not expect_free() [which is post-2.6.11-specific]


Modified: trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/ip_conntrack_pptp.c
===================================================================
--- trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/ip_conntrack_pptp.c	2005-06-10 09:00:05 UTC (rev 3968)
+++ trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/ip_conntrack_pptp.c	2005-06-10 19:12:01 UTC (rev 3969)
@@ -224,20 +224,20 @@
 	
 		/* Add GRE keymap entries */
 		if (ip_ct_gre_keymap_add(exp, &exp->tuple, 0) != 0) {
-			ip_conntrack_expect_free(exp);
+			ip_conntrack_expect_put(exp);
 			return 1;
 		}
 
 		invert_tuplepr(&inv_tuple, &exp->tuple);
 		if (ip_ct_gre_keymap_add(exp, &inv_tuple, 1) != 0) {
 			ip_ct_gre_keymap_destroy(exp);
-			ip_conntrack_expect_free(exp);
+			ip_conntrack_expect_put(exp);
 			return 1;
 		}
 	
 		if (ip_conntrack_expect_related(exp, master) != 0) {
 			ip_ct_gre_keymap_destroy(exp);
-			ip_conntrack_expect_free(exp);
+			ip_conntrack_expect_put(exp);
 			DEBUGP("cannot expect_related()\n");
 			return 1;
 		}