From ba061e7b71e0a87a7dba85e2e3b2455f49ddd65f Mon Sep 17 00:00:00 2001
From: stephen hemminger <shemminger@vyatta.com>
Date: Mon, 12 Apr 2010 05:41:31 +0000
Subject: [PATCH] --- yaml --- r: 194031 b: refs/heads/master c:
 93fa159abe50d3c55c7f83622d3f5c09b6e06f4b h: refs/heads/master i:   194029:
 73b644d4b9966fed7d6a4a301bc887d46ea78ba8   194027:
 ab6259f860bdeadfb59d6cdc5c03753e84e1d0ae   194023:
 dc30f8deb5dd049348ddc6cb999c70fdab2c685b   194015:
 480f7c20171ae70edc3938b6747a446e63e845ee v: v3

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

diff --git a/[refs] b/[refs]
index 3dd4b3bbeaa4..e6552d70b29c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3941f1885bbf5b9f5e45cdd5a82efc794cc3823f
+refs/heads/master: 93fa159abe50d3c55c7f83622d3f5c09b6e06f4b
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index 1b00bfef268e..a9913d23f7c7 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -4047,7 +4047,8 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
 			addrconf_leave_anycast(ifp);
 		addrconf_leave_solict(ifp->idev, &ifp->addr);
 		dst_hold(&ifp->rt->u.dst);
-		if (ip6_del_rt(ifp->rt))
+
+		if (ifp->dead && ip6_del_rt(ifp->rt))
 			dst_free(&ifp->rt->u.dst);
 		break;
 	}