[netfilter-cvslog] r3720 -
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter
yasuyuki at netfilter.org
yasuyuki at netfilter.org
Thu Feb 17 17:02:03 CET 2005
Author: yasuyuki at netfilter.org
Date: 2005-02-17 17:02:03 +0100 (Thu, 17 Feb 2005)
New Revision: 3720
Modified:
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_standalone.c
Log:
- killed the meaningless assignment in kill_l3proto().
- delete export symbol of nf_conntrack_expect_list which was killed.
- editorial cleanup to reduce difference with ip_conntrack.
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_standalone.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_standalone.c 2005-02-17 15:52:46 UTC (rev 3719)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_standalone.c 2005-02-17 16:02:03 UTC (rev 3720)
@@ -53,10 +53,8 @@
static int kill_l3proto(struct nf_conn *i, void *data)
{
- struct nf_conntrack_l3proto *l3proto;
- l3proto = (struct nf_conntrack_l3proto *)data;
return (i->tuplehash[NF_CT_DIR_ORIGINAL].tuple.src.l3num ==
- l3proto->l3proto);
+ ((struct nf_conntrack_l3proto *)data)->l3proto);
}
static int kill_proto(struct nf_conn *i, void *data)
@@ -77,6 +75,7 @@
{
return l3proto->print_tuple(s, tuple) || proto->print_tuple(s, tuple);
}
+
#ifdef CONFIG_NF_CT_ACCT
static unsigned int
seq_print_counters(struct seq_file *s,
@@ -126,13 +125,13 @@
return 0;
l3proto = nf_ct_find_l3proto(conntrack->tuplehash[NF_CT_DIR_ORIGINAL]
- .tuple.src.l3num);
+ .tuple.src.l3num);
NF_CT_ASSERT(l3proto);
proto = nf_ct_find_proto(conntrack->tuplehash[NF_CT_DIR_ORIGINAL]
- .tuple.src.l3num,
- conntrack->tuplehash[NF_CT_DIR_ORIGINAL]
- .tuple.dst.protonum);
+ .tuple.src.l3num,
+ conntrack->tuplehash[NF_CT_DIR_ORIGINAL]
+ .tuple.dst.protonum);
NF_CT_ASSERT(proto);
if (seq_printf(s, "%-8s %u %-8s %u %lu ",
@@ -384,6 +383,7 @@
#endif /* CONFIG_PROC_FS */
/* Sysctl support */
+
#ifdef CONFIG_SYSCTL
/* From nf_conntrack_core.c */
@@ -806,7 +806,6 @@
EXPORT_SYMBOL(nf_conntrack_unexpect_related);
EXPORT_SYMBOL(nf_conntrack_tuple_taken);
EXPORT_SYMBOL(nf_conntrack_htable_size);
-EXPORT_SYMBOL(nf_conntrack_expect_list);
EXPORT_SYMBOL(nf_conntrack_lock);
EXPORT_SYMBOL(nf_conntrack_hash);
EXPORT_SYMBOL(nf_conntrack_untracked);
More information about the netfilter-cvslog
mailing list