---

yaml --- r: 90718 b: refs/heads/master c: ef1a5a5 h: refs/heads/master v: v3
git-mirror · Apr 14, 2008 · 875b580 · 875b580
1 parent f1218ba
commit 875b580
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7bfd0a1a6c8f82977253dab19be9d9979c1ec1b
+refs/heads/master: ef1a5a50bbd509b8697dcd4d13017e9e0053867b
diff --git a/trunk/net/netfilter/nf_conntrack_core.c b/trunk/net/netfilter/nf_conntrack_core.c
@@ -766,7 +766,7 @@ void nf_conntrack_alter_reply(struct nf_conn *ct,
 	nf_ct_dump_tuple(newreply);
 
 	ct->tuplehash[IP_CT_DIR_REPLY].tuple = *newreply;
-	if (ct->master || (help && help->expecting != 0))
+	if (ct->master || (help && !hlist_empty(&help->expectations)))
 		return;
 
 	rcu_read_lock();