netfilter: conntrack: un-export seq_print_acct

Only one caller, just place it where its needed.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/net/netfilter/nf_conntrack_acct.h b/include/net/netfilter/nf_conntrack_acct.h
index 79d8d16732b426d722f11ec2951ef03891159a63..ae5a1c37387ea3beaaa6cd76206466f2f828efd5 100644 (file)
--- a/include/net/netfilter/nf_conntrack_acct.h
+++ b/include/net/netfilter/nf_conntrack_acct.h
@@ -46,9 +46,6 @@ struct nf_conn_acct *nf_ct_acct_ext_add(struct nf_conn *ct, gfp_t gfp)
        return acct;
 };
 
-unsigned int seq_print_acct(struct seq_file *s, const struct nf_conn *ct,
-                           int dir);
-
 /* Check if connection tracking accounting is enabled */
 static inline bool nf_ct_acct_enabled(struct net *net)
 {

diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
index 1d66de5151b2d9551ad4061ff10ea0df739fae54..a7ad0e19e0de269cb67ff058f955ebd7986f16f9 100644 (file)
--- a/net/netfilter/nf_conntrack_acct.c
+++ b/net/netfilter/nf_conntrack_acct.c
@@ -38,25 +38,6 @@ static struct ctl_table acct_sysctl_table[] = {
 };
 #endif /* CONFIG_SYSCTL */
 
-unsigned int
-seq_print_acct(struct seq_file *s, const struct nf_conn *ct, int dir)
-{
-       struct nf_conn_acct *acct;
-       struct nf_conn_counter *counter;
-
-       acct = nf_conn_acct_find(ct);
-       if (!acct)
-               return 0;
-
-       counter = acct->counter;
-       seq_printf(s, "packets=%llu bytes=%llu ",
-                  (unsigned long long)atomic64_read(&counter[dir].packets),
-                  (unsigned long long)atomic64_read(&counter[dir].bytes));
-
-       return 0;
-};
-EXPORT_SYMBOL_GPL(seq_print_acct);
-
 static const struct nf_ct_ext_type acct_extend = {
        .len    = sizeof(struct nf_conn_acct),
        .align  = __alignof__(struct nf_conn_acct),

diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 463d17d349c1bca02361fbb625059f93b34e3bc0..feeff346f946164f1a5b29836fd687c3f4be4905 100644 (file)
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -267,6 +267,24 @@ static const char* l4proto_name(u16 proto)
        return "unknown";
 }
 
+static unsigned int
+seq_print_acct(struct seq_file *s, const struct nf_conn *ct, int dir)
+{
+       struct nf_conn_acct *acct;
+       struct nf_conn_counter *counter;
+
+       acct = nf_conn_acct_find(ct);
+       if (!acct)
+               return 0;
+
+       counter = acct->counter;
+       seq_printf(s, "packets=%llu bytes=%llu ",
+                  (unsigned long long)atomic64_read(&counter[dir].packets),
+                  (unsigned long long)atomic64_read(&counter[dir].bytes));
+
+       return 0;
+}
+
 /* return 0 on success, 1 in case of error */
 static int ct_seq_show(struct seq_file *s, void *v)
 {