diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-01-24 00:20:07 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:53:35 -0500 |
commit | b24b8a247ff65c01b252025926fe564209fae4fc (patch) | |
tree | 8a9e0ea1e24b4733d8b9433d41877659505e9da4 /net/ipv4/ipmr.c | |
parent | a92aa318b4b369091fd80433c80e62838db8bc1c (diff) |
[NET]: Convert init_timer into setup_timer
Many-many code in the kernel initialized the timer->function
and timer->data together with calling init_timer(timer). There
is already a helper for this. Use it for networking code.
The patch is HUGE, but makes the code 130 lines shorter
(98 insertions(+), 228 deletions(-)).
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipmr.c')
-rw-r--r-- | net/ipv4/ipmr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 37bb497d92af..ba6c23cdf47b 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -1889,8 +1889,7 @@ void __init ip_mr_init(void) | |||
1889 | sizeof(struct mfc_cache), | 1889 | sizeof(struct mfc_cache), |
1890 | 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, | 1890 | 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, |
1891 | NULL); | 1891 | NULL); |
1892 | init_timer(&ipmr_expire_timer); | 1892 | setup_timer(&ipmr_expire_timer, ipmr_expire_process, 0); |
1893 | ipmr_expire_timer.function=ipmr_expire_process; | ||
1894 | register_netdevice_notifier(&ip_mr_notifier); | 1893 | register_netdevice_notifier(&ip_mr_notifier); |
1895 | #ifdef CONFIG_PROC_FS | 1894 | #ifdef CONFIG_PROC_FS |
1896 | proc_net_fops_create(&init_net, "ip_mr_vif", 0, &ipmr_vif_fops); | 1895 | proc_net_fops_create(&init_net, "ip_mr_vif", 0, &ipmr_vif_fops); |