[NETFILTER]: Fix nf_conntrack compilation with CONFIG_NETFILTER_DEBUG

[NETFILTER]: Fix nf_conntrack compilation with CONFIG_NETFILTER_DEBUG

[Patrick McHardy]

[-- 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--;

Re: [NETFILTER]: Fix nf_conntrack compilation with CONFIG_NETFILTER_DEBUG

[David S. Miller]

Applied, thanks Patrick.