summaryrefslogtreecommitdiff
path: root/sys/netinet6
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2016-03-07 11:00:37 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2016-03-07 11:00:37 +0000
commit3024c3e4bba0fc6948d392ea802253a386a70ea2 (patch)
treec520356817dd4ca0b74c71fab8ee8195a8e10151 /sys/netinet6
parent7f35d0b573a97b2ed127377f63dd54351c5044be (diff)
Do not remove RTF_STATIC L2 entries from the routing table.
This restore the previous behavior without looking at the reference counter of route entries. Static entries might not have a cloning route to re-create them and when their timer expires they were completly gone as found the hardway by matthieu@. ok matthieu@
Diffstat (limited to 'sys/netinet6')
-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 be302ac19d5..4ad611428c3 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nd6.c,v 1.176 2015/12/03 21:57:59 mpi Exp $ */
+/* $OpenBSD: nd6.c,v 1.177 2016/03/07 11:00:36 mpi Exp $ */
/* $KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $ */
/*
@@ -833,7 +833,8 @@ nd6_free(struct rtentry *rt, int gc)
* caches, and disable the route entry not to be used in already
* cached routes.
*/
- rtdeletemsg(rt, ifp, ifp->if_rdomain);
+ if (!ISSET(rt->rt_flags, RTF_STATIC))
+ rtdeletemsg(rt, ifp, ifp->if_rdomain);
splx(s);
if_put(ifp);