From 5c4b847bba54ece49d11ea56b14319658ebb912b Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir.fraser@cl.cam.ac.uk>
Date: Tue, 29 Aug 2006 02:43:49 -0700
Subject: [PATCH] --- yaml --- r: 33689 b: refs/heads/master c:
 57f5f544f58ffa1d6c38630d0522c9c0be67c533 h: refs/heads/master i:   33687:
 00d044694271c0ca736e8b636a473cc713e5fafb v: v3

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

diff --git a/[refs] b/[refs]
index 712222313342..54d3dccc3c10 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fab2caf62ed03d83bd3a3598b859c3c345a8e8b5
+refs/heads/master: 57f5f544f58ffa1d6c38630d0522c9c0be67c533
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index 0c5042e7380d..c7852b38e03e 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -578,6 +578,8 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr, int pfxlen,
 	ifa->flags = flags | IFA_F_TENTATIVE;
 	ifa->cstamp = ifa->tstamp = jiffies;
 
+	ifa->rt = rt;
+
 	ifa->idev = idev;
 	in6_dev_hold(idev);
 	/* For caller */
@@ -603,8 +605,6 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr, int pfxlen,
 	}
 #endif
 
-	ifa->rt = rt;
-
 	in6_ifa_hold(ifa);
 	write_unlock(&idev->lock);
 out2: