summaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2016-11-22 14:44:18 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2016-12-06 21:42:18 +0100
commitf28e15bacedd444608e25421c72eb2cf4527c9ca (patch)
tree5c99a3a592e8debaeb789cd4d23c5ac037e03e34 /net/ipv6
parent4d31eef5176df06f218201bc9c0ce40babb41660 (diff)
downloadblackbird-op-linux-f28e15bacedd444608e25421c72eb2cf4527c9ca.tar.gz
blackbird-op-linux-f28e15bacedd444608e25421c72eb2cf4527c9ca.zip
netfilter: x_tables: pass xt_counters struct to counter allocator
Keeps some noise away from a followup patch. Signed-off-by: Florian Westphal <fw@strlen.de> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/netfilter/ip6_tables.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index 88b56a98905b..a5a92083fd62 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -570,12 +570,9 @@ find_check_entry(struct ip6t_entry *e, struct net *net, const char *name,
unsigned int j;
struct xt_mtchk_param mtpar;
struct xt_entry_match *ematch;
- unsigned long pcnt;
- pcnt = xt_percpu_counter_alloc();
- if (IS_ERR_VALUE(pcnt))
+ if (!xt_percpu_counter_alloc(&e->counters))
return -ENOMEM;
- e->counters.pcnt = pcnt;
j = 0;
mtpar.net = net;
OpenPOWER on IntegriCloud