---

yaml --- r: 236575 b: refs/heads/master c: 3bfd45f h: refs/heads/master i: 236573: de274bf 236571: 90f4fb2 236567: 9175483 236559: 3ac9d73 236543: a1a39cb v: v3
git-mirror · Nov 16, 2010 · de4a56c · de4a56c
1 parent 91a5855
commit de4a56c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5d277d29ad1ae9add8d6984025ccd2e835971ce
+refs/heads/master: 3bfd45f93c8bca7a5dc955235ff083602d95aa43
diff --git a/trunk/net/netfilter/nf_conntrack_expect.c b/trunk/net/netfilter/nf_conntrack_expect.c
@@ -323,7 +323,8 @@ static void nf_ct_expect_insert(struct nf_conntrack_expect *exp)
 	const struct nf_conntrack_expect_policy *p;
 	unsigned int h = nf_ct_expect_dst_hash(&exp->tuple);
 
-	atomic_inc(&exp->use);
+	/* two references : one for hash insert, one for the timer */
+	atomic_add(2, &exp->use);
 
 	if (master_help) {
 		hlist_add_head(&exp->lnode, &master_help->expectations);
@@ -345,7 +346,6 @@ static void nf_ct_expect_insert(struct nf_conntrack_expect *exp)
 	}
 	add_timer(&exp->timeout);
 
-	atomic_inc(&exp->use);
 	NF_CT_STAT_INC(net, expect_create);
 }