---

yaml --- r: 98079 b: refs/heads/master c: ceeff75 h: refs/heads/master i: 98077: f019259 98075: 5ce9a14 98071: a806a8d 98063: df873b1 98047: 1c92244 v: v3
git-mirror · Jun 12, 2008 · a98418a · a98418a
1 parent f8bfa68
commit a98418a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b66985b11b8b00e1ec65b89a3112510ac9a9ec6e
+refs/heads/master: ceeff7541e5a4ba8e8d97ffbae32b3f283cb7a3f
diff --git a/trunk/net/netfilter/nf_conntrack_core.c b/trunk/net/netfilter/nf_conntrack_core.c
@@ -196,8 +196,6 @@ destroy_conntrack(struct nf_conntrack *nfct)
 	if (l4proto && l4proto->destroy)
 		l4proto->destroy(ct);
 
-	nf_ct_ext_destroy(ct);
-
 	rcu_read_unlock();
 
 	spin_lock_bh(&nf_conntrack_lock);
@@ -520,6 +518,7 @@ static void nf_conntrack_free_rcu(struct rcu_head *head)
 
 void nf_conntrack_free(struct nf_conn *ct)
 {
+	nf_ct_ext_destroy(ct);
 	call_rcu(&ct->rcu, nf_conntrack_free_rcu);
 }
 EXPORT_SYMBOL_GPL(nf_conntrack_free);