From 0a81ab50306539788e2dd0471f3b1ed5b9dcc5ef Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Wed, 3 Jan 2018 10:57:31 +0100 Subject: Backport patch: netfilter: ipset: Convert timers to use timer_setup() --- kernel/net/netfilter/ipset/ip_set_bitmap_ip.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'kernel/net/netfilter/ipset/ip_set_bitmap_ip.c') diff --git a/kernel/net/netfilter/ipset/ip_set_bitmap_ip.c b/kernel/net/netfilter/ipset/ip_set_bitmap_ip.c index 9f4f28d..d3e0174 100644 --- a/kernel/net/netfilter/ipset/ip_set_bitmap_ip.c +++ b/kernel/net/netfilter/ipset/ip_set_bitmap_ip.c @@ -48,6 +48,9 @@ struct bitmap_ip { size_t memsize; /* members size */ u8 netmask; /* subnet netmask */ struct timer_list gc; /* garbage collection */ +#ifdef HAVE_TIMER_SETUP + struct ip_set *set; /* attached to this ip_set */ +#endif unsigned char extensions[0] /* data extensions */ __aligned(__alignof__(u64)); }; @@ -232,6 +235,9 @@ init_map_ip(struct ip_set *set, struct bitmap_ip *map, map->netmask = netmask; set->timeout = IPSET_NO_TIMEOUT; +#ifdef HAVE_TIMER_SETUP + map->set = set; +#endif set->data = map; set->family = NFPROTO_IPV4; -- cgit v1.2.3