aboutsummaryrefslogtreecommitdiffstats
path: root/net/802/tr.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-01-24 00:20:07 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:53:35 -0500
commitb24b8a247ff65c01b252025926fe564209fae4fc (patch)
tree8a9e0ea1e24b4733d8b9433d41877659505e9da4 /net/802/tr.c
parenta92aa318b4b369091fd80433c80e62838db8bc1c (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/802/tr.c')
-rw-r--r--net/802/tr.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/802/tr.c b/net/802/tr.c
index 1e115e5beab6..151855dd4599 100644
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -641,10 +641,8 @@ struct net_device *alloc_trdev(int sizeof_priv)
641 641
642static int __init rif_init(void) 642static int __init rif_init(void)
643{ 643{
644 init_timer(&rif_timer);
645 rif_timer.expires = jiffies + sysctl_tr_rif_timeout; 644 rif_timer.expires = jiffies + sysctl_tr_rif_timeout;
646 rif_timer.data = 0L; 645 setup_timer(&rif_timer, rif_check_expire, 0);
647 rif_timer.function = rif_check_expire;
648 add_timer(&rif_timer); 646 add_timer(&rif_timer);
649 647
650 proc_net_fops_create(&init_net, "tr_rif", S_IRUGO, &rif_seq_fops); 648 proc_net_fops_create(&init_net, "tr_rif", S_IRUGO, &rif_seq_fops);