projects
/
linux-edison.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e7bfd0a
)
[NETFILTER]: nf_conntrack: fix incorrect check for expectations
author
Patrick McHardy
<kaber@trash.net>
Mon, 14 Apr 2008 09:21:01 +0000
(11:21 +0200)
committer
Patrick McHardy
<kaber@trash.net>
Mon, 14 Apr 2008 09:21:01 +0000
(11:21 +0200)
The expectation classes changed help->expectations to an array,
fix use as scalar value.
Signed-off-by: Patrick McHardy <kaber@trash.net>
net/netfilter/nf_conntrack_core.c
patch
|
blob
|
history
diff --git
a/net/netfilter/nf_conntrack_core.c
b/net/netfilter/nf_conntrack_core.c
index
3512373
..
4eac65c
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();