diff options
author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2018-01-03 10:57:31 +0100 |
---|---|---|
committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2018-01-03 10:57:31 +0100 |
commit | 0a81ab50306539788e2dd0471f3b1ed5b9dcc5ef (patch) | |
tree | 995fcac0cdf514dcd941da9a10d0ab580e74871b /kernel/net/netfilter/ipset/ip_set_bitmap_gen.h | |
parent | d71dd93599b932693f045301424c2276cd25a87e (diff) |
Backport patch: netfilter: ipset: Convert timers to use timer_setup()
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, 4 insertions, 5 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h b/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h index 856cc26..aa3dbb1 100644 --- a/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h +++ b/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h @@ -37,11 +37,11 @@ #define get_ext(set, map, id) ((map)->extensions + ((set)->dsize * (id))) static void -mtype_gc_init(struct ip_set *set, void (*gc)(unsigned long ul_set)) +mtype_gc_init(struct ip_set *set, void (*gc)(GC_ARG)) { struct mtype *map = set->data; - setup_timer(&map->gc, gc, (unsigned long)set); + TIMER_SETUP(&map->gc, gc); mod_timer(&map->gc, jiffies + IPSET_GC_PERIOD(set->timeout) * HZ); } @@ -274,10 +274,9 @@ out: } static void -mtype_gc(unsigned long ul_set) +mtype_gc(GC_ARG) { - struct ip_set *set = (struct ip_set *)ul_set; - struct mtype *map = set->data; + INIT_GC_VARS(mtype, map); void *x; u32 id; |