Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b216e21 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: un-export seq_print_acct 



Only one caller, just place it where its needed.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent a0badcc6

include/net/netfilter/nf_conntrack_acct.h

+0 −3
Original line number Diff line number Diff line
@@ -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)

{

net/netfilter/nf_conntrack_acct.c

+0 −19
Original line number Diff line number Diff line
@@ -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),

net/netfilter/nf_conntrack_standalone.c

+18 −0
Original line number Diff line number Diff line
@@ -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)

{