diff options
Diffstat (limited to 'net/ipv4/ipmr.c')
-rw-r--r-- | net/ipv4/ipmr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 37bb497d92a..ba6c23cdf47 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -1889,8 +1889,7 @@ void __init ip_mr_init(void) | |||
1889 | sizeof(struct mfc_cache), | 1889 | sizeof(struct mfc_cache), |
1890 | 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, | 1890 | 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, |
1891 | NULL); | 1891 | NULL); |
1892 | init_timer(&ipmr_expire_timer); | 1892 | setup_timer(&ipmr_expire_timer, ipmr_expire_process, 0); |
1893 | ipmr_expire_timer.function=ipmr_expire_process; | ||
1894 | register_netdevice_notifier(&ip_mr_notifier); | 1893 | register_netdevice_notifier(&ip_mr_notifier); |
1895 | #ifdef CONFIG_PROC_FS | 1894 | #ifdef CONFIG_PROC_FS |
1896 | proc_net_fops_create(&init_net, "ip_mr_vif", 0, &ipmr_vif_fops); | 1895 | proc_net_fops_create(&init_net, "ip_mr_vif", 0, &ipmr_vif_fops); |