From 83649f07c7d3395b4f14c2b7edbdc6be67d39371 Mon Sep 17 00:00:00 2001
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Wed, 24 Apr 2002 19:09:48 +0000
Subject: [PATCH] Correct timer management (deprecated) in nd6_timer.

Obtained from:	KAME
MFC after:	3 days
---
 sys/netinet6/nd6.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 0d355ba3309..58597d5482a 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -578,7 +578,8 @@ nd6_timer(ignored_arg)
 
 			if (regen)
 				goto addrloop; /* XXX: see below */
-		} else if (IFA6_IS_DEPRECATED(ia6)) {
+		}
+		if (IFA6_IS_DEPRECATED(ia6)) {
 			int oldflags = ia6->ia6_flags;
 
 			ia6->ia6_flags |= IN6_IFF_DEPRECATED;
@@ -607,7 +608,7 @@ nd6_timer(ignored_arg)
 					goto addrloop;
 				}
 			}
-		} else if (IFA6_IS_DEPRECATED(ia6)) {
+		} else {
 			/*
 			 * A new RA might have made a deprecated address
 			 * preferred.