diff options
| author |   Patrick McHardy <kaber@trash.net> | 2008-04-14 11:21:01 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2008-04-14 11:21:01 +0200 |
| commit | ef1a5a50bbd509b8697dcd4d13017e9e0053867b (patch) | |
| tree | c278eef43ffd756b0f09589ce1dd9310a50f7af1 /net/netfilter | |
| parent | [NETFILTER]: bridge: add ebt_nflog watcher (diff) | |
| download | linux-dev-ef1a5a50bbd509b8697dcd4d13017e9e0053867b.tar.xz linux-dev-ef1a5a50bbd509b8697dcd4d13017e9e0053867b.zip | |
[NETFILTER]: nf_conntrack: fix incorrect check for expectations
The expectation classes changed help->expectations to an array,
fix use as scalar value.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/nf_conntrack_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 351237399e27..4eac65c74ed0 100644 --- 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(); |