summaryrefslogtreecommitdiffstats
path: root/sys/netinet6/nd6.c
diff options
context:
space:
mode:
authorume <ume@FreeBSD.org>2002-04-24 19:09:48 +0000
committerume <ume@FreeBSD.org>2002-04-24 19:09:48 +0000
commitd2b734fd1e70d1221ec3695684403516f602420c (patch)
tree83539e08f3997c6f90acef5f3f90f059359edeed /sys/netinet6/nd6.c
parent9f567eb8e0a9a663fb31d6a757dc8968482662a0 (diff)
downloadFreeBSD-src-d2b734fd1e70d1221ec3695684403516f602420c.zip
FreeBSD-src-d2b734fd1e70d1221ec3695684403516f602420c.tar.gz
Correct timer management (deprecated) in nd6_timer.
Obtained from: KAME MFC after: 3 days
Diffstat (limited to 'sys/netinet6/nd6.c')
-rw-r--r--sys/netinet6/nd6.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 0d355ba..58597d5 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.
OpenPOWER on IntegriCloud