From e76e9ade5628ff8930a622e3a42c8595be763002 Mon Sep 17 00:00:00 2001
From: Andrey Vagin <avagin@parallels.com>
Date: Tue, 8 Jul 2008 15:13:31 -0700
Subject: [PATCH] --- yaml --- r: 98827 b: refs/heads/master c:
 b2238566401f01eb796e75750213c7b0fce396b2 h: refs/heads/master i:   98825:
 da2a019091dc57fbce186eb35d883ac7d209ddb3   98823:
 ab8b39e9231b44619be4d302866e841987ed204a v: v3

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

diff --git a/[refs] b/[refs]
index 7544a754d874..e4786395e346 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07035fc1bbf931a06e47583cddd2cea2907ac0db
+refs/heads/master: b2238566401f01eb796e75750213c7b0fce396b2
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index 147588f4c7c0..ff61a5cdb0b3 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -749,12 +749,12 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp)
 	}
 	write_unlock_bh(&idev->lock);
 
+	addrconf_del_timer(ifp);
+
 	ipv6_ifa_notify(RTM_DELADDR, ifp);
 
 	atomic_notifier_call_chain(&inet6addr_chain, NETDEV_DOWN, ifp);
 
-	addrconf_del_timer(ifp);
-
 	/*
 	 * Purge or update corresponding prefix
 	 *