2 files changed, 7 insertions, 14 deletions

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 013e3d3ab0f1..33ae9b01131e 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -167,11 +167,9 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a
                 sp->autoclose * HZ;
 
         /* Initilizes the timers */
-        for (i = SCTP_EVENT_TIMEOUT_NONE; i < SCTP_NUM_TIMEOUT_TYPES; ++i) {
-                init_timer(&asoc->timers[i]);
-                asoc->timers[i].function = sctp_timer_events[i];
-                asoc->timers[i].data = (unsigned long) asoc;
-        }
+        for (i = SCTP_EVENT_TIMEOUT_NONE; i < SCTP_NUM_TIMEOUT_TYPES; ++i)
+                setup_timer(&asoc->timers[i], sctp_timer_events[i],
+                                (unsigned long)asoc);
 
         /* Pull default initialization values from the sock options.
          * Note: This assumes that the values have already been
diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index d55ce83a020b..dfa109341aeb 100644
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -99,15 +99,10 @@ static struct sctp_transport *sctp_transport_init(struct sctp_transport *peer,
         INIT_LIST_HEAD(&peer->send_ready);
         INIT_LIST_HEAD(&peer->transports);
 
-        /* Set up the retransmission timer.  */
-        init_timer(&peer->T3_rtx_timer);
-        peer->T3_rtx_timer.function = sctp_generate_t3_rtx_event;
-        peer->T3_rtx_timer.data = (unsigned long)peer;
-
-        /* Set up the heartbeat timer. */
-        init_timer(&peer->hb_timer);
-        peer->hb_timer.function = sctp_generate_heartbeat_event;
-        peer->hb_timer.data = (unsigned long)peer;
+        setup_timer(&peer->T3_rtx_timer, sctp_generate_t3_rtx_event,
+                        (unsigned long)peer);
+        setup_timer(&peer->hb_timer, sctp_generate_heartbeat_event,
+                        (unsigned long)peer);
 
         /* Initialize the 64-bit random nonce sent with heartbeat. */
         get_random_bytes(&peer->hb_nonce, sizeof(peer->hb_nonce));