: Clean up ip_conntrack stats
PATCH 1/19 : Clean up ip_conntrack stats
Use CONNTRACK_STAT_INC for changing statistics.
# This is a BitKeeper generated diff -Nru style patch. #
# ChangeSet
# 2004/10/19 02:06:42+02:00 [email protected]
# [NETFILTER]: Clean up ip_conntrack stats
#
# Signed-off-by: Pablo Neira <[email protected]>
# Signed-off-by: Patrick McHardy <[email protected]>
#
# net/ipv4/netfilter/ip_conntrack_core.c # 2004/10/19 02:06:14+02:00 [email protected] +2 -4 # [NETFILTER]: Clean up ip_conntrack stats # # Signed-off-by: Pablo Neira <[email protected]> # Signed-off-by: Patrick McHardy <[email protected]> # diff -Nru a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c --- a/net/ipv4/netfilter/ip_conntrack_core.c 2004-10-22 03:36:57 +02:00 +++ b/net/ipv4/netfilter/ip_conntrack_core.c 2004-10-22 03:36:57 +02:00 @@ -352,16 +352,14 @@ { struct ip_conntrack_tuple_hash *h; unsigned int hash = hash_conntrack(tuple); - /* use per_cpu() to avoid multiple calls to smp_processor_id() */ - unsigned int cpu = smp_processor_id();
MUST_BE_READ_LOCKED(&ip_conntrack_lock); list_for_each_entry(h, &ip_conntrack_hash[hash], list) {
if (conntrack_tuple_cmp(h, tuple, ignored_conntrack)) {
- per_cpu(ip_conntrack_stat, cpu).found++;
+ CONNTRACK_STAT_INC(found);
return h;
}
- per_cpu(ip_conntrack_stat, cpu).searched++;
+ CONNTRACK_STAT_INC(searched);
}
return NULL;