From: Rusty Russell I removed this code in a previous patch, and Patrick McHardy explained what was wrong. Add a comment. Signed-off-by: Rusty Russell Signed-off-by: Andrew Morton --- 25-akpm/net/ipv4/netfilter/ip_conntrack_core.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletion(-) diff -puN net/ipv4/netfilter/ip_conntrack_core.c~netfilter-add-comment-above-remove_expectations-in net/ipv4/netfilter/ip_conntrack_core.c --- 25/net/ipv4/netfilter/ip_conntrack_core.c~netfilter-add-comment-above-remove_expectations-in 2004-12-31 03:56:27.234398736 -0800 +++ 25-akpm/net/ipv4/netfilter/ip_conntrack_core.c 2004-12-31 03:56:27.239397976 -0800 @@ -299,7 +299,10 @@ destroy_conntrack(struct nf_conntrack *n ip_conntrack_destroyed(ct); WRITE_LOCK(&ip_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); _