netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_pptp.c

pluto cvs at pld-linux.org
Mon Aug 1 16:23:57 CEST 2005


Author: pluto
Date: Mon Aug  1 16:23:55 2005
New Revision: 6286

Modified:
   netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_pptp.c
Log:
- revert accidental merge.


Modified: netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_pptp.c
==============================================================================
--- netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_pptp.c	(original)
+++ netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_pptp.c	Mon Aug  1 16:23:55 2005
@@ -156,7 +156,7 @@
 		ip_ct_refresh_acct(sibling, 0, NULL, 0);
 		return 1;
 	} else {
-		exp = __ip_conntrack_expect_find(t);
+		exp = __ip_conntrack_exp_find(t);
 		if (exp) {
 			DEBUGP("unexpect_related of expect %p\n", exp);
 			ip_conntrack_unexpect_related(exp);



More information about the pld-cvs-commit mailing list