[netfilter-cvslog] r3701 - trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-02-15 02:52:19 +0100 (Tue, 15 Feb 2005)
New Revision: 3701

Modified:
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c
Log:
netfilter: Add comment above remove_expectations in destroy_conntrack()


Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c	2005-02-15 01:51:25 UTC (rev 3700)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c	2005-02-15 01:52:19 UTC (rev 3701)
@@ -523,7 +523,10 @@
 		nf_conntrack_destroyed(ct);
 
 	WRITE_LOCK(&nf_conntrack_lock);
-	/* Make sure don't leave any orphaned expectations lying around */
+	/* Expectations will have been removed in clean_from_lists,
+	 * except TFTP can create an expectation on the first packet,
+	 * before connection is in the list, so we need to clean here,
+	 * too. */
 	if (ct->expecting)
 		remove_expectations(ct, 1);