From a98418a0b2b2cf357018ced8d528d5ba10430c41 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Wed, 11 Jun 2008 17:51:10 -0700
Subject: [PATCH] --- yaml --- r: 98079 b: refs/heads/master c:
 ceeff7541e5a4ba8e8d97ffbae32b3f283cb7a3f h: refs/heads/master i:   98077:
 f019259350e477cbc21022f4e5608d825a2b5293   98075:
 5ce9a144fc5a6b1401fd882ea2af6a1bec981e45   98071:
 a806a8d114291a06eaa958ccfbd7a2462b9ecba1   98063:
 df873b1ae820e47af24d75c40fe9ca9130eac6a4   98047:
 1c9224489a0bd4d965e49e0a3c52048298c769a3 v: v3

---
 [refs]                                  | 2 +-
 trunk/net/netfilter/nf_conntrack_core.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index eaa8c5768497..20ea0bcf381a 100644
--- 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
index c4b1799da5d7..662c1ccfee26 100644
--- 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);