[NETFILTER]: nf_conntrack: fix incorrect check for expectations

[linux-2.6-omap-h63xx.git] / net / netfilter / nf_conntrack_core.c

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 351237399e27aef463914f728f191edb98be357a..4eac65c74ed05ac18a504957f2dbcb721bb2014d 100644 (file)
--- a/net/netfilter/nf_conntrack_core.c
+++ b/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();