diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-01-24 00:20:07 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:53:35 -0500 |
commit | b24b8a247ff65c01b252025926fe564209fae4fc (patch) | |
tree | 8a9e0ea1e24b4733d8b9433d41877659505e9da4 /net/xfrm/xfrm_policy.c | |
parent | a92aa318b4b369091fd80433c80e62838db8bc1c (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/xfrm/xfrm_policy.c')
-rw-r--r-- | net/xfrm/xfrm_policy.c | 5 |
1 files changed, 2 insertions, 3 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) | |||
196 | INIT_HLIST_NODE(&policy->byidx); | 196 | INIT_HLIST_NODE(&policy->byidx); |
197 | rwlock_init(&policy->lock); | 197 | rwlock_init(&policy->lock); |
198 | atomic_set(&policy->refcnt, 1); | 198 | atomic_set(&policy->refcnt, 1); |
199 | init_timer(&policy->timer); | 199 | setup_timer(&policy->timer, xfrm_policy_timer, |
200 | policy->timer.data = (unsigned long)policy; | 200 | (unsigned long)policy); |
201 | policy->timer.function = xfrm_policy_timer; | ||
202 | } | 201 | } |
203 | return policy; | 202 | return policy; |
204 | } | 203 | } |