# This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/09/22 02:04:02+02:00 kaber@coreworks.de # {NETFILTER]: Move ip_ct_log_invalid to ip_conntrack_core.c # # Signed-off-by: Patrick McHardy # # net/ipv4/netfilter/ip_conntrack_standalone.c # 2004/09/22 02:03:37+02:00 kaber@coreworks.de +0 -2 # {NETFILTER]: Move ip_ct_log_invalid to ip_conntrack_core.c # # Signed-off-by: Patrick McHardy # # net/ipv4/netfilter/ip_conntrack_core.c # 2004/09/22 02:03:37+02:00 kaber@coreworks.de +1 -0 # {NETFILTER]: Move ip_ct_log_invalid to ip_conntrack_core.c # # Signed-off-by: Patrick McHardy # 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-09-22 02:10:28 +02:00 +++ b/net/ipv4/netfilter/ip_conntrack_core.c 2004-09-22 02:10:28 +02:00 @@ -74,6 +74,7 @@ static kmem_cache_t *ip_conntrack_cachep; static kmem_cache_t *ip_conntrack_expect_cachep; struct ip_conntrack ip_conntrack_untracked; +unsigned int ip_ct_log_invalid; DEFINE_PER_CPU(struct ip_conntrack_stat, ip_conntrack_stat); diff -Nru a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c --- a/net/ipv4/netfilter/ip_conntrack_standalone.c 2004-09-22 02:10:28 +02:00 +++ b/net/ipv4/netfilter/ip_conntrack_standalone.c 2004-09-22 02:10:28 +02:00 @@ -48,8 +48,6 @@ extern atomic_t ip_conntrack_count; DECLARE_PER_CPU(struct ip_conntrack_stat, ip_conntrack_stat); -unsigned int ip_ct_log_invalid = 0; - static int kill_proto(const struct ip_conntrack *i, void *data) { return (i->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum ==