From 9ad187bd5e40a36b79a5312ae04debd0c045bea0 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Mon, 21 Apr 2008 14:23:03 -0700
Subject: [PATCH] --- yaml --- r: 91932 b: refs/heads/master c:
 2aed2827dfc2e7d2e385fc1580529a8fc7f33d47 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f137f6f995a2..f311cdc918f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f25c3d613b12b4b6219d03e9930cac5f59541468
+refs/heads/master: 2aed2827dfc2e7d2e385fc1580529a8fc7f33d47
diff --git a/trunk/net/ipv6/ip6_fib.c b/trunk/net/ipv6/ip6_fib.c
index 50f3f8f8a59b..1ee4fa17c129 100644
--- a/trunk/net/ipv6/ip6_fib.c
+++ b/trunk/net/ipv6/ip6_fib.c
@@ -1543,7 +1543,7 @@ static int fib6_net_init(struct net *net)
 static void fib6_net_exit(struct net *net)
 {
 	rt6_ifdown(net, NULL);
-	del_timer(net->ipv6.ip6_fib_timer);
+	del_timer_sync(net->ipv6.ip6_fib_timer);
 	kfree(net->ipv6.ip6_fib_timer);
 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
 	kfree(net->ipv6.fib6_local_tbl);