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/appletalk/aarp.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/appletalk/aarp.c')
-rw-r--r-- | net/appletalk/aarp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c index 6c5c6dc098ec..b950fb6bd2bf 100644 --- a/net/appletalk/aarp.c +++ b/net/appletalk/aarp.c | |||
@@ -874,9 +874,7 @@ void __init aarp_proto_init(void) | |||
874 | aarp_dl = register_snap_client(aarp_snap_id, aarp_rcv); | 874 | aarp_dl = register_snap_client(aarp_snap_id, aarp_rcv); |
875 | if (!aarp_dl) | 875 | if (!aarp_dl) |
876 | printk(KERN_CRIT "Unable to register AARP with SNAP.\n"); | 876 | printk(KERN_CRIT "Unable to register AARP with SNAP.\n"); |
877 | init_timer(&aarp_timer); | 877 | setup_timer(&aarp_timer, aarp_expire_timeout, 0); |
878 | aarp_timer.function = aarp_expire_timeout; | ||
879 | aarp_timer.data = 0; | ||
880 | aarp_timer.expires = jiffies + sysctl_aarp_expiry_time; | 878 | aarp_timer.expires = jiffies + sysctl_aarp_expiry_time; |
881 | add_timer(&aarp_timer); | 879 | add_timer(&aarp_timer); |
882 | register_netdevice_notifier(&aarp_notifier); | 880 | register_netdevice_notifier(&aarp_notifier); |