diff options
Diffstat (limited to 'net/ipv6/addrconf.c')
| -rw-r--r-- | net/ipv6/addrconf.c | 4 |
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) |