From 61bc38d12ac1f2275056357db877dd80cd670b50 Mon Sep 17 00:00:00 2001
From: Hiroyuki YAMAMORI <h-yamamo@db3.so-net.ne.jp>
Date: Fri, 23 Dec 2005 11:24:05 -0800
Subject: [PATCH] --- yaml --- r: 15326 b: refs/heads/master c:
 291d809ba5c8d4d6d8812e3f185bdf57d539f594 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5a10fe17def8..c62f3ccd27cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dd3bf83574e38578fc9741c0e23e4fa7f7ff96e
+refs/heads/master: 291d809ba5c8d4d6d8812e3f185bdf57d539f594
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index d805241e439c..2a6439e3c91c 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -2782,6 +2782,9 @@ static void addrconf_verify(unsigned long foo)
 						in6_ifa_hold(ifpub);
 						spin_unlock(&ifp->lock);
 						read_unlock(&addrconf_hash_lock);
+						spin_lock(&ifpub->lock);
+						ifpub->regen_count = 0;
+						spin_unlock(&ifpub->lock);
 						ipv6_create_tempaddr(ifpub, ifp);
 						in6_ifa_put(ifpub);
 						in6_ifa_put(ifp);