summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2016-08-25 16:12:17 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2016-08-25 16:12:17 +0000
commit1ebe310d37e65e5427997a2f927a6bbb78d7ff41 (patch)
tree03714f0bcd92d53be02b7fba67279a7bcabe4b94 /sys
parent304cd3e824475e4201eefb221188508aea0589df (diff)
Remove a check to expire received prefix.
This check does not make sense since November 2000 when IPv6 autoconf address deletion has been made independent from prefix lifetimes. Fix a case when a route was added to the table but the corresponding address was not, leaving v6 unusable. Found the hardway by and ok sthen@
Diffstat (limited to 'sys')
-rw-r--r--sys/netinet6/nd6_rtr.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
index 6fdac5a708f..e03fa0199b6 100644
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nd6_rtr.c,v 1.141 2016/08/22 10:33:22 mpi Exp $ */
+/* $OpenBSD: nd6_rtr.c,v 1.142 2016/08/25 16:12:16 mpi Exp $ */
/* $KAME: nd6_rtr.c,v 1.97 2001/02/07 11:09:13 itojun Exp $ */
/*
@@ -1249,19 +1249,6 @@ prelist_update(struct nd_prefix *new, struct nd_defrouter *dr, struct mbuf *m)
goto end; /* we should just give up in this case. */
}
- /*
- * XXX: from the ND point of view, we can ignore a prefix
- * with the on-link bit being zero. However, we need a
- * prefix structure for references from autoconfigured
- * addresses. Thus, we explicitly make sure that the prefix
- * itself expires now.
- */
- if (newpr->ndpr_raf_onlink == 0) {
- newpr->ndpr_vltime = 0;
- newpr->ndpr_pltime = 0;
- in6_init_prefix_ltimes(newpr);
- }
-
pr = newpr;
}