diff options
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c index 40a46d482490..3a020720e40b 100644 --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c | |||
@@ -18,19 +18,7 @@ | |||
18 | #include <net/netfilter/nf_conntrack_l3proto.h> | 18 | #include <net/netfilter/nf_conntrack_l3proto.h> |
19 | #include <net/netfilter/nf_conntrack_l4proto.h> | 19 | #include <net/netfilter/nf_conntrack_l4proto.h> |
20 | #include <net/netfilter/nf_conntrack_expect.h> | 20 | #include <net/netfilter/nf_conntrack_expect.h> |
21 | 21 | #include <net/netfilter/nf_conntrack_acct.h> | |
22 | #ifdef CONFIG_NF_CT_ACCT | ||
23 | static unsigned int | ||
24 | seq_print_counters(struct seq_file *s, | ||
25 | const struct ip_conntrack_counter *counter) | ||
26 | { | ||
27 | return seq_printf(s, "packets=%llu bytes=%llu ", | ||
28 | (unsigned long long)counter->packets, | ||
29 | (unsigned long long)counter->bytes); | ||
30 | } | ||
31 | #else | ||
32 | #define seq_print_counters(x, y) 0 | ||
33 | #endif | ||
34 | 22 | ||
35 | struct ct_iter_state { | 23 | struct ct_iter_state { |
36 | unsigned int bucket; | 24 | unsigned int bucket; |
@@ -127,7 +115,7 @@ static int ct_seq_show(struct seq_file *s, void *v) | |||
127 | l3proto, l4proto)) | 115 | l3proto, l4proto)) |
128 | return -ENOSPC; | 116 | return -ENOSPC; |
129 | 117 | ||
130 | if (seq_print_counters(s, &ct->counters[IP_CT_DIR_ORIGINAL])) | 118 | if (seq_print_acct(s, ct, IP_CT_DIR_ORIGINAL)) |
131 | return -ENOSPC; | 119 | return -ENOSPC; |
132 | 120 | ||
133 | if (!(test_bit(IPS_SEEN_REPLY_BIT, &ct->status))) | 121 | if (!(test_bit(IPS_SEEN_REPLY_BIT, &ct->status))) |
@@ -138,7 +126,7 @@ static int ct_seq_show(struct seq_file *s, void *v) | |||
138 | l3proto, l4proto)) | 126 | l3proto, l4proto)) |
139 | return -ENOSPC; | 127 | return -ENOSPC; |
140 | 128 | ||
141 | if (seq_print_counters(s, &ct->counters[IP_CT_DIR_REPLY])) | 129 | if (seq_print_acct(s, ct, IP_CT_DIR_REPLY)) |
142 | return -ENOSPC; | 130 | return -ENOSPC; |
143 | 131 | ||
144 | if (test_bit(IPS_ASSURED_BIT, &ct->status)) | 132 | if (test_bit(IPS_ASSURED_BIT, &ct->status)) |