[netfilter-cvslog] r3696 -
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter
laforge at netfilter.org
laforge at netfilter.org
Tue Feb 15 02:37:11 CET 2005
Author: laforge at netfilter.org
Date: 2005-02-15 02:37:08 +0100 (Tue, 15 Feb 2005)
New Revision: 3696
Modified:
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c
Log:
merge ip_conntrack_core v1.69 (cleanup stats)
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c 2005-02-14 23:39:56 UTC (rev 3695)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c 2005-02-15 01:37:08 UTC (rev 3696)
@@ -3,7 +3,7 @@
extension. */
/* (C) 1999-2001 Paul `Rusty' Russell
- * (C) 2002-2004 Netfilter Core Team <coreteam at netfilter.org>
+ * (C) 2002-2005 Netfilter Core Team <coreteam at netfilter.org>
* (C) 2003,2004 USAGI/WIDE Project <http://www.linux-ipv6.org>
*
* This program is free software; you can redistribute it and/or modify
@@ -54,7 +54,7 @@
#include <linux/netfilter/nf_conntrack_core.h>
#include <linux/netfilter_ipv4/listhelp.h>
-#define NF_CONNTRACK_VERSION "0.3"
+#define NF_CONNTRACK_VERSION "0.3.1"
#if 0
#define DEBUGP printk
@@ -583,10 +583,10 @@
MUST_BE_READ_LOCKED(&nf_conntrack_lock);
list_for_each_entry(h, &nf_conntrack_hash[hash], list) {
if (conntrack_tuple_cmp(h, tuple, ignored_conntrack)) {
- per_cpu(nf_conntrack_stat, cpu).found++;
+ NF_CT_STAT_INC(found);
return h;
}
- per_cpu(nf_conntrack_stat, cpu).searched++;
+ NF_CT_STAT_INC(searched);
}
return NULL;
More information about the netfilter-cvslog
mailing list