SOURCES (LINUX_2_6): linux-2.6-pom-ng-branch.diff - revert acciden...

[pluto]

Author: pluto                        Date: Mon Aug  1 14:25:21 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- revert accidental merge (only pptp module affected).

---- Files affected:
SOURCES:
   linux-2.6-pom-ng-branch.diff (1.1.2.15 -> 1.1.2.16) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-pom-ng-branch.diff
diff -u SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.15 SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.16
--- SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.15	Mon Aug  1 12:48:03 2005
+++ SOURCES/linux-2.6-pom-ng-branch.diff	Mon Aug  1 16:25:15 2005
@@ -19075,7 +19075,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);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-pom-ng-branch.diff?r1=1.1.2.15&r2=1.1.2.16&f=u