* [NETFILTER]: Fix nf_conntrack compilation with CONFIG_NETFILTER_DEBUG
@ 2005-11-17 3:23 Patrick McHardy
2005-11-17 7:14 ` David S. Miller
0 siblings, 1 reply; 2+ messages in thread
From: Patrick McHardy @ 2005-11-17 3:23 UTC (permalink / raw)
To: David S. Miller; +Cc: Netfilter Development Mailinglist
[-- Attachment #1: x --]
[-- Type: text/plain, Size: 1444 bytes --]
[NETFILTER]: Fix nf_conntrack compilation with CONFIG_NETFILTER_DEBUG
CC [M] net/netfilter/nf_conntrack_core.o
net/netfilter/nf_conntrack_core.c: In function 'nf_ct_unlink_expect':
net/netfilter/nf_conntrack_core.c:390: error: 'exp_timeout' undeclared (first use in this function)
net/netfilter/nf_conntrack_core.c:390: error: (Each undeclared identifier is reported only once
net/netfilter/nf_conntrack_core.c:390: error: for each function it appears in.)
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
commit 666e7efd137d0751f27e7305a719349b5324cc0e
tree 675a8ce7c9c8fd0b9e5a9569122d4fd108da884e
parent f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081
author Patrick McHardy <kaber@trash.net> Thu, 17 Nov 2005 04:22:48 +0100
committer Patrick McHardy <kaber@trash.net> Thu, 17 Nov 2005 04:22:48 +0100
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 ea094b2..1da6783 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -387,7 +387,7 @@ nf_ct_invert_tuple(struct nf_conntrack_t
static void nf_ct_unlink_expect(struct nf_conntrack_expect *exp)
{
ASSERT_WRITE_LOCK(&nf_conntrack_lock);
- NF_CT_ASSERT(!timer_pending(&exp_timeout));
+ NF_CT_ASSERT(!timer_pending(&exp->timeout));
list_del(&exp->list);
NF_CT_STAT_INC(expect_delete);
exp->master->expecting--;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [NETFILTER]: Fix nf_conntrack compilation with CONFIG_NETFILTER_DEBUG
2005-11-17 3:23 [NETFILTER]: Fix nf_conntrack compilation with CONFIG_NETFILTER_DEBUG Patrick McHardy
@ 2005-11-17 7:14 ` David S. Miller
0 siblings, 0 replies; 2+ messages in thread
From: David S. Miller @ 2005-11-17 7:14 UTC (permalink / raw)
To: kaber; +Cc: netfilter-devel
Applied, thanks Patrick.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-11-17 7:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-11-17 3:23 [NETFILTER]: Fix nf_conntrack compilation with CONFIG_NETFILTER_DEBUG Patrick McHardy
2005-11-17 7:14 ` David S. Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.