From ca117c028717bf75abf3b2b5a42185a51fd589e2 Mon Sep 17 00:00:00 2001
From: Benjamin Thery <benjamin.thery@bull.net>
Date: Mon, 10 Nov 2008 16:34:11 -0800
Subject: [PATCH] --- yaml --- r: 118657 b: refs/heads/master c:
 87b30a6530218cde431a659f2c118cb72175507c h: refs/heads/master i:   118655:
 25661028c5d3e77f3ab1cb97ab27186b50403665 v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv6/ip6mr.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 875ed3db26d4..8ac996daa83f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1207e795568a368928dfd23d6817e47f2e8097e3
+refs/heads/master: 87b30a6530218cde431a659f2c118cb72175507c
diff --git a/trunk/net/ipv6/ip6mr.c b/trunk/net/ipv6/ip6mr.c
index 182f8a177e7f..52a7eb0e2c2c 100644
--- a/trunk/net/ipv6/ip6mr.c
+++ b/trunk/net/ipv6/ip6mr.c
@@ -981,14 +981,15 @@ int __init ip6_mr_init(void)
 		goto proc_cache_fail;
 #endif
 	return 0;
-reg_notif_fail:
-	kmem_cache_destroy(mrt_cachep);
 #ifdef CONFIG_PROC_FS
-proc_vif_fail:
-	unregister_netdevice_notifier(&ip6_mr_notifier);
 proc_cache_fail:
 	proc_net_remove(&init_net, "ip6_mr_vif");
+proc_vif_fail:
+	unregister_netdevice_notifier(&ip6_mr_notifier);
 #endif
+reg_notif_fail:
+	del_timer(&ipmr_expire_timer);
+	kmem_cache_destroy(mrt_cachep);
 	return err;
 }