diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2018-01-04 13:21:26 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2018-01-04 13:21:26 +0100 |
| commit | ad92ed77e77fe421a86f0fde907c51286ed47928 (patch) | |
| tree | 412d16a99a72446666734d404ffd380eb85d6f49 /kernel/net/netfilter/ipset/ip_set_bitmap_gen.h | |
| parent | 0a81ab50306539788e2dd0471f3b1ed5b9dcc5ef (diff) | |
Fix "don't update counters" mode when counters used at the matching
The matching of the counters was not taken into account, fixed.
Diffstat (limited to 'kernel/net/netfilter/ipset/ip_set_bitmap_gen.h')
| -rw-r--r-- | kernel/net/netfilter/ipset/ip_set_bitmap_gen.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h b/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h index aa3dbb1..0c9db19 100644 --- a/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h +++ b/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h @@ -129,14 +129,7 @@ mtype_test(struct ip_set *set, void *value, const struct ip_set_ext *ext, if (ret <= 0) return ret; - if (SET_WITH_TIMEOUT(set) && - ip_set_timeout_expired(ext_timeout(x, set))) - return 0; - if (SET_WITH_COUNTER(set)) - ip_set_update_counter(ext_counter(x, set), ext, mext, flags); - if (SET_WITH_SKBINFO(set)) - ip_set_get_skbinfo(ext_skbinfo(x, set), ext, mext, flags); - return 1; + return ip_set_match_extensions(set, ext, mext, flags, x); } static int |