[netfilter-cvslog] r3999 - 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-24 18:34:17 +0200 (Fri, 24 Jun 2005)
New Revision: 3999

Modified:
   trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/ip_conntrack_pptp.c
Log:
no need to expect_put() if expect_related() fails.


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-24 16:33:07 UTC (rev 3998)
+++ trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/ip_conntrack_pptp.c	2005-06-24 16:34:17 UTC (rev 3999)
@@ -237,7 +237,8 @@
 	
 		if (ip_conntrack_expect_related(exp, master) != 0) {
 			ip_ct_gre_keymap_destroy(exp);
-			ip_conntrack_expect_put(exp);
+			/* no need to expect_put(), since expect_related
+			 * takes care of this if it fails */
 			DEBUGP("cannot expect_related()\n");
 			return 1;
 		}