[NET]: Convert init_timer into setup_timer

[mirror_ubuntu-zesty-kernel.git] / net / 802 / tr.c

diff --git a/net/802/tr.c b/net/802/tr.c
index 1e115e5beab635aeb67baede5c4aa36881545efe..151855dd45993e85511885f0aaa81fff9917541e 100644 (file)
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -641,10 +641,8 @@ struct net_device *alloc_trdev(int sizeof_priv)
 
 static int __init rif_init(void)
 {
-       init_timer(&rif_timer);
        rif_timer.expires  = jiffies + sysctl_tr_rif_timeout;
-       rif_timer.data     = 0L;
-       rif_timer.function = rif_check_expire;
+       setup_timer(&rif_timer, rif_check_expire, 0);
        add_timer(&rif_timer);
 
        proc_net_fops_create(&init_net, "tr_rif", S_IRUGO, &rif_seq_fops);