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_ipmac.c | |
| parent | d71dd93599b932693f045301424c2276cd25a87e (diff) | |
Backport patch: netfilter: ipset: Convert timers to use timer_setup()
Diffstat (limited to 'kernel/net/netfilter/ipset/ip_set_bitmap_ipmac.c')
| -rw-r--r-- | kernel/net/netfilter/ipset/ip_set_bitmap_ipmac.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_bitmap_ipmac.c b/kernel/net/netfilter/ipset/ip_set_bitmap_ipmac.c index f7415d4..319600a 100644 --- a/kernel/net/netfilter/ipset/ip_set_bitmap_ipmac.c +++ b/kernel/net/netfilter/ipset/ip_set_bitmap_ipmac.c @@ -52,6 +52,9 @@ struct bitmap_ipmac { u32 elements; /* number of max elements in the set */ size_t memsize; /* members size */ struct timer_list gc; /* garbage collector */ +#ifdef HAVE_TIMER_SETUP + struct ip_set *set; /* attached to this ip_set */ +#endif unsigned char extensions[0] /* MAC + data extensions */ __aligned(__alignof__(u64)); }; @@ -307,6 +310,9 @@ init_map_ipmac(struct ip_set *set, struct bitmap_ipmac *map, map->elements = elements; set->timeout = IPSET_NO_TIMEOUT; +#ifdef HAVE_TIMER_SETUP + map->set = set; +#endif set->data = map; set->family = NFPROTO_IPV4; |