diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2005-01-03 04:18:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-03 04:18:31 -0800 |
| commit | 6dd1537e8b3c713c350850a746e924413b59e758 (patch) | |
| tree | f1adcd4e82027371d39c3f3258ea76c77a5c455d /net | |
| parent | 4759d4d9134afe52efaab2a8c1867aa494f3e812 (diff) | |
| download | history-6dd1537e8b3c713c350850a746e924413b59e758.tar.gz | |
[PATCH] netfilter: Add comment above remove_expectations in destroy_conntrack()
I removed this code in a previous patch, and Patrick McHardy explained
what was wrong. Add a comment.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c index 828298948a984e..2e5e4a936b6e42 100644 --- a/net/ipv4/netfilter/ip_conntrack_core.c +++ b/net/ipv4/netfilter/ip_conntrack_core.c @@ -299,7 +299,10 @@ destroy_conntrack(struct nf_conntrack *nfct) 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); |