diff options
| author | Florian Westphal <fw@strlen.de> | 2016-11-22 14:44:18 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-18 11:18:54 +0100 |
| commit | dac4448faf499b2597536aecfdb46eeace17a243 (patch) | |
| tree | 61aad3075fcbf89826b5a62c62840bb5c9937bd3 /net/ipv6 | |
| parent | 61346e20c0017abf77bd133f80c35ca9224fbd96 (diff) | |
| download | linux-stable-dac4448faf499b2597536aecfdb46eeace17a243.tar.gz linux-stable-dac4448faf499b2597536aecfdb46eeace17a243.tar.bz2 linux-stable-dac4448faf499b2597536aecfdb46eeace17a243.zip | |
netfilter: x_tables: pass xt_counters struct to counter allocator
commit f28e15bacedd444608e25421c72eb2cf4527c9ca upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/netfilter/ip6_tables.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c index 3117c17ed0db..d70b302b2f21 100644 --- a/net/ipv6/netfilter/ip6_tables.c +++ b/net/ipv6/netfilter/ip6_tables.c @@ -578,12 +578,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; |