aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/addrconf.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-01-24 00:20:07 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:53:35 -0500
commitb24b8a247ff65c01b252025926fe564209fae4fc (patch)
tree8a9e0ea1e24b4733d8b9433d41877659505e9da4 /net/ipv6/addrconf.c
parenta92aa318b4b369091fd80433c80e62838db8bc1c (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/ipv6/addrconf.c')
-rw-r--r--net/ipv6/addrconf.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index e8c347579da9..c0720e4659bc 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -366,9 +366,7 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev)
366 in6_dev_hold(ndev); 366 in6_dev_hold(ndev);
367 367
368#ifdef CONFIG_IPV6_PRIVACY 368#ifdef CONFIG_IPV6_PRIVACY
369 init_timer(&ndev->regen_timer); 369 setup_timer(&ndev->regen_timer, ipv6_regen_rndid, (unsigned long)ndev);
370 ndev->regen_timer.function = ipv6_regen_rndid;
371 ndev->regen_timer.data = (unsigned long) ndev;
372 if ((dev->flags&IFF_LOOPBACK) || 370 if ((dev->flags&IFF_LOOPBACK) ||
373 dev->type == ARPHRD_TUNNEL || 371 dev->type == ARPHRD_TUNNEL ||
374#if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE) 372#if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE)