9 files changed, 21 insertions, 41 deletions

diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 7dbc282d4f9..701558564e9 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -1234,9 +1234,7 @@ void ip_mc_inc_group(struct in_device *in_dev, __be32 addr)
         spin_lock_init(&im->lock);
 #ifdef CONFIG_IP_MULTICAST
         im->tm_running=0;
-        init_timer(&im->timer);
-        im->timer.data=(unsigned long)im;
-        im->timer.function=&igmp_timer_expire;
+        setup_timer(&im->timer, &igmp_timer_expire, (unsigned long)im);
         im->unsolicit_count = IGMP_Unsolicited_Report_Count;
         im->reporter = 0;
         im->gsquery = 0;
@@ -1338,13 +1336,11 @@ void ip_mc_init_dev(struct in_device *in_dev)
         in_dev->mc_tomb = NULL;
 #ifdef CONFIG_IP_MULTICAST
         in_dev->mr_gq_running = 0;
-        init_timer(&in_dev->mr_gq_timer);
-        in_dev->mr_gq_timer.data=(unsigned long) in_dev;
-        in_dev->mr_gq_timer.function=&igmp_gq_timer_expire;
+        setup_timer(&in_dev->mr_gq_timer, igmp_gq_timer_expire,
+                        (unsigned long)in_dev);
         in_dev->mr_ifc_count = 0;
-        init_timer(&in_dev->mr_ifc_timer);
-        in_dev->mr_ifc_timer.data=(unsigned long) in_dev;
-        in_dev->mr_ifc_timer.function=&igmp_ifc_timer_expire;
+        setup_timer(&in_dev->mr_ifc_timer, igmp_ifc_timer_expire,
+                        (unsigned long)in_dev);
         in_dev->mr_qrv = IGMP_Unsolicited_Report_Count;
 #endif
 
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 8fb6ca23700..1c2a32f6bfc 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -277,18 +277,11 @@ void inet_csk_init_xmit_timers(struct sock *sk,
 {
         struct inet_connection_sock *icsk = inet_csk(sk);
 
-        init_timer(&icsk->icsk_retransmit_timer);
-        init_timer(&icsk->icsk_delack_timer);
-        init_timer(&sk->sk_timer);
-
-        icsk->icsk_retransmit_timer.function = retransmit_handler;
-        icsk->icsk_delack_timer.function     = delack_handler;
-        sk->sk_timer.function                = keepalive_handler;
-
-        icsk->icsk_retransmit_timer.data =
-                icsk->icsk_delack_timer.data =
-                        sk->sk_timer.data  = (unsigned long)sk;
-
+        setup_timer(&icsk->icsk_retransmit_timer, retransmit_handler,
+                        (unsigned long)sk);
+        setup_timer(&icsk->icsk_delack_timer, delack_handler,
+                        (unsigned long)sk);
+        setup_timer(&sk->sk_timer, keepalive_handler, (unsigned long)sk);
         icsk->icsk_pending = icsk->icsk_ack.pending = 0;
 }
 
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
index e15e04fc666..737910767ff 100644
--- a/net/ipv4/inet_fragment.c
+++ b/net/ipv4/inet_fragment.c
@@ -66,9 +66,8 @@ void inet_frags_init(struct inet_frags *f)
         f->nqueues = 0;
         atomic_set(&f->mem, 0);
 
-        init_timer(&f->secret_timer);
-        f->secret_timer.function = inet_frag_secret_rebuild;
-        f->secret_timer.data = (unsigned long)f;
+        setup_timer(&f->secret_timer, inet_frag_secret_rebuild,
+                        (unsigned long)f);
         f->secret_timer.expires = jiffies + f->ctl->secret_interval;
         add_timer(&f->secret_timer);
 }
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 37bb497d92a..ba6c23cdf47 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -1889,8 +1889,7 @@ void __init ip_mr_init(void)
                                        sizeof(struct mfc_cache),
                                        0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
                                        NULL);
-        init_timer(&ipmr_expire_timer);
-        ipmr_expire_timer.function=ipmr_expire_process;
+        setup_timer(&ipmr_expire_timer, ipmr_expire_process, 0);
         register_netdevice_notifier(&ip_mr_notifier);
 #ifdef CONFIG_PROC_FS
         proc_net_fops_create(&init_net, "ip_mr_vif", 0, &ipmr_vif_fops);
diff --git a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c
index 0a9f3c37e18..a22cee43ed7 100644
--- a/net/ipv4/ipvs/ip_vs_conn.c
+++ b/net/ipv4/ipvs/ip_vs_conn.c
@@ -629,9 +629,7 @@ ip_vs_conn_new(int proto, __be32 caddr, __be16 cport, __be32 vaddr, __be16 vport
         }
 
         INIT_LIST_HEAD(&cp->c_list);
-        init_timer(&cp->timer);
-        cp->timer.data     = (unsigned long)cp;
-        cp->timer.function = ip_vs_conn_expire;
+        setup_timer(&cp->timer, ip_vs_conn_expire, (unsigned long)cp);
         cp->protocol       = proto;
         cp->caddr          = caddr;
         cp->cport          = cport;
diff --git a/net/ipv4/ipvs/ip_vs_est.c b/net/ipv4/ipvs/ip_vs_est.c
index 7d68b80c4c1..efdd74e4fa2 100644
--- a/net/ipv4/ipvs/ip_vs_est.c
+++ b/net/ipv4/ipvs/ip_vs_est.c
@@ -146,9 +146,8 @@ int ip_vs_new_estimator(struct ip_vs_stats *stats)
         write_lock_bh(&est_lock);
         est->next = est_list;
         if (est->next == NULL) {
-                init_timer(&est_timer);
+                setup_timer(&est_timer, estimation_timer, 0);
                 est_timer.expires = jiffies + 2*HZ;
-                est_timer.function = estimation_timer;
                 add_timer(&est_timer);
         }
         est_list = est;
diff --git a/net/ipv4/ipvs/ip_vs_lblc.c b/net/ipv4/ipvs/ip_vs_lblc.c
index ad89644ef5d..bf8c04a5754 100644
--- a/net/ipv4/ipvs/ip_vs_lblc.c
+++ b/net/ipv4/ipvs/ip_vs_lblc.c
@@ -391,9 +391,8 @@ static int ip_vs_lblc_init_svc(struct ip_vs_service *svc)
         /*
          *    Hook periodic timer for garbage collection
          */
-        init_timer(&tbl->periodic_timer);
-        tbl->periodic_timer.data = (unsigned long)tbl;
-        tbl->periodic_timer.function = ip_vs_lblc_check_expire;
+        setup_timer(&tbl->periodic_timer, ip_vs_lblc_check_expire,
+                        (unsigned long)tbl);
         tbl->periodic_timer.expires = jiffies+CHECK_EXPIRE_INTERVAL;
         add_timer(&tbl->periodic_timer);
 
diff --git a/net/ipv4/ipvs/ip_vs_lblcr.c b/net/ipv4/ipvs/ip_vs_lblcr.c
index 2a5ed85a335..f50da641137 100644
--- a/net/ipv4/ipvs/ip_vs_lblcr.c
+++ b/net/ipv4/ipvs/ip_vs_lblcr.c
@@ -575,9 +575,8 @@ static int ip_vs_lblcr_init_svc(struct ip_vs_service *svc)
         /*
          *    Hook periodic timer for garbage collection
          */
-        init_timer(&tbl->periodic_timer);
-        tbl->periodic_timer.data = (unsigned long)tbl;
-        tbl->periodic_timer.function = ip_vs_lblcr_check_expire;
+        setup_timer(&tbl->periodic_timer, ip_vs_lblcr_check_expire,
+                        (unsigned long)tbl);
         tbl->periodic_timer.expires = jiffies+CHECK_EXPIRE_INTERVAL;
         add_timer(&tbl->periodic_timer);
 
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 28484f396b0..49e008568dd 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2964,10 +2964,8 @@ int __init ip_rt_init(void)
         devinet_init();
         ip_fib_init();
 
-        init_timer(&rt_flush_timer);
-        rt_flush_timer.function = rt_run_flush;
-        init_timer(&rt_secret_timer);
-        rt_secret_timer.function = rt_secret_rebuild;
+        setup_timer(&rt_flush_timer, rt_run_flush, 0);
+        setup_timer(&rt_secret_timer, rt_secret_rebuild, 0);
 
         /* All the timers, started at system startup tend
            to synchronize. Perturb it a bit.