git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-05-02 18:17:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

netfilter: ipset: use setup_timer() and mod_timer().

Browse Source 
Use setup_timer() and instead of init_timer(), being the preferred way
of setting up a timer.

Also, quoting the mod_timer() function comment:
-> mod_timer() is a more efficient way to update the expire field of an
   active timer (if the timer is inactive it will be activated).

Use setup_timer() and mod_timer() to setup and arm a timer, making the
code compact and easier to read.

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
This commit is contained in:
Jozsef Kadlecsik
2016-11-10 12:32:07 +01:00
parent c0db95c7bc
commit fcb58a0332
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/netfilter/ipset/ip_set_bitmap_gen.h
View File

@@ -41,11 +41,8 @@ mtype_gc_init(struct ip_set *set, void (*gc)(unsigned long ul_set))
{ {
struct mtype *map = set->data; struct mtype *map = set->data;
init_timer(&map->gc); setup_timer(&map->gc, gc, (unsigned long)set);
map->gc.data = (unsigned long)set; mod_timer(&map->gc, jiffies + IPSET_GC_PERIOD(set->timeout) * HZ);
map->gc.function = gc;
map->gc.expires = jiffies + IPSET_GC_PERIOD(set->timeout) * HZ;
add_timer(&map->gc);
} }
static void static void

7
net/netfilter/ipset/ip_set_hash_gen.h
View File

@@ -433,11 +433,8 @@ mtype_gc_init(struct ip_set *set, void (*gc)(unsigned long ul_set))
{ {
struct htype *h = set->data; struct htype *h = set->data;
init_timer(&h->gc); setup_timer(&h->gc, gc, (unsigned long)set);
h->gc.data = (unsigned long)set; mod_timer(&h->gc, jiffies + IPSET_GC_PERIOD(set->timeout) * HZ);
h->gc.function = gc;
h->gc.expires = jiffies + IPSET_GC_PERIOD(set->timeout) * HZ;
add_timer(&h->gc);
pr_debug("gc initialized, run in every %u\n", pr_debug("gc initialized, run in every %u\n",
IPSET_GC_PERIOD(set->timeout)); IPSET_GC_PERIOD(set->timeout));
} }

7
net/netfilter/ipset/ip_set_list_set.c
View File

@@ -586,11 +586,8 @@ list_set_gc_init(struct ip_set *set, void (*gc)(unsigned long ul_set))
{ {
struct list_set *map = set->data; struct list_set *map = set->data;
init_timer(&map->gc); setup_timer(&map->gc, gc, (unsigned long)set);
map->gc.data = (unsigned long)set; mod_timer(&map->gc, jiffies + IPSET_GC_PERIOD(set->timeout) * HZ);
map->gc.function = gc;
map->gc.expires = jiffies + IPSET_GC_PERIOD(set->timeout) * HZ;
add_timer(&map->gc);
} }
/* Create list:set type of sets */ /* Create list:set type of sets */