From e9a39d96317420d661387d6f159558a91d341c23 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <dada1@cosmosbay.com>
Date: Tue, 24 Mar 2009 14:26:50 +0100
Subject: [PATCH] --- yaml --- r: 135507 b: refs/heads/master c:
 1d45209d89e647e9f27e4afa1f47338df73bc112 h: refs/heads/master i:   135505:
 22f3fc9d4ff84fb20667bf4dba8dadb8f3e2ab6f   135503:
 0b3677e2a537f1befb7132d330a4b79f6bf40b2b v: v3

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

diff --git a/[refs] b/[refs]
index bacc82ce0415..662bddda6cac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd5b6ce6fd465eab90357711c8e8124dc3a31ff0
+refs/heads/master: 1d45209d89e647e9f27e4afa1f47338df73bc112
diff --git a/trunk/net/netfilter/nf_conntrack_core.c b/trunk/net/netfilter/nf_conntrack_core.c
index ebc275600125..55befe59e1c0 100644
--- a/trunk/net/netfilter/nf_conntrack_core.c
+++ b/trunk/net/netfilter/nf_conntrack_core.c
@@ -517,16 +517,17 @@ EXPORT_SYMBOL_GPL(nf_conntrack_alloc);
 static void nf_conntrack_free_rcu(struct rcu_head *head)
 {
 	struct nf_conn *ct = container_of(head, struct nf_conn, rcu);
-	struct net *net = nf_ct_net(ct);
 
 	nf_ct_ext_free(ct);
 	kmem_cache_free(nf_conntrack_cachep, ct);
-	atomic_dec(&net->ct.count);
 }
 
 void nf_conntrack_free(struct nf_conn *ct)
 {
+	struct net *net = nf_ct_net(ct);
+
 	nf_ct_ext_destroy(ct);
+	atomic_dec(&net->ct.count);
 	call_rcu(&ct->rcu, nf_conntrack_free_rcu);
 }
 EXPORT_SYMBOL_GPL(nf_conntrack_free);