2 files changed, 5 insertions, 9 deletions

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 26b846e11bfb..df5bfa837eb3 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -196,9 +196,8 @@ struct xfrm_policy *xfrm_policy_alloc(gfp_t gfp)
                 INIT_HLIST_NODE(&policy->byidx);
                 rwlock_init(&policy->lock);
                 atomic_set(&policy->refcnt, 1);
-                init_timer(&policy->timer);
-                policy->timer.data = (unsigned long)policy;
-                policy->timer.function = xfrm_policy_timer;
+                setup_timer(&policy->timer, xfrm_policy_timer,
+                                (unsigned long)policy);
         }
         return policy;
 }
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index f26aaaca1fae..51866b7fab3c 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -504,12 +504,9 @@ struct xfrm_state *xfrm_state_alloc(void)
                 INIT_HLIST_NODE(&x->bydst);
                 INIT_HLIST_NODE(&x->bysrc);
                 INIT_HLIST_NODE(&x->byspi);
-                init_timer(&x->timer);
-                x->timer.function = xfrm_timer_handler;
-                x->timer.data     = (unsigned long)x;
-                init_timer(&x->rtimer);
-                x->rtimer.function = xfrm_replay_timer_handler;
-                x->rtimer.data     = (unsigned long)x;
+                setup_timer(&x->timer, xfrm_timer_handler, (unsigned long)x);
+                setup_timer(&x->rtimer, xfrm_replay_timer_handler,
+                                (unsigned long)x);
                 x->curlft.add_time = get_seconds();
                 x->lft.soft_byte_limit = XFRM_INF;
                 x->lft.soft_packet_limit = XFRM_INF;