[src/netbsd-3]: src/sys/netinet6 Pullup rev 1.92 (requested by tron in ticket...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/46ea5873ab96
branches:  netbsd-3
changeset: 575305:46ea5873ab96
user:      jmc <jmc%NetBSD.org@localhost>
date:      Thu Apr 07 17:06:56 2005 +0000

description:
Pullup rev 1.92 (requested by tron in ticket #105)

        Make sure that prefixes get purged. PR#21189, PR#25968, PR#27873

diffstat:

 sys/netinet6/nd6.c |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (32 lines):

diff -r 1dacf79d1d1e -r 46ea5873ab96 sys/netinet6/nd6.c
--- a/sys/netinet6/nd6.c        Thu Apr 07 17:06:21 2005 +0000
+++ b/sys/netinet6/nd6.c        Thu Apr 07 17:06:56 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nd6.c,v 1.91 2004/12/04 16:10:25 peter Exp $   */
+/*     $NetBSD: nd6.c,v 1.91.10.1 2005/04/07 17:06:56 jmc Exp $        */
 /*     $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $   */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.91 2004/12/04 16:10:25 peter Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.91.10.1 2005/04/07 17:06:56 jmc Exp $");
 
 #include "opt_ipsec.h"
 
@@ -637,6 +637,13 @@
                npr = pr->ndpr_next;
                if (pr->ndpr_ifp == ifp) {
                        /*
+                        * Because if_detach() does *not* release prefixes
+                        * while purging addresses the reference count will
+                        * still be above zero. We therefore reset it to
+                        * make sure that the prefix really gets purged.
+                        */
+                       pr->ndpr_refcnt = 0;
+                       /*
                         * Previously, pr->ndpr_addr is removed as well,
                         * but I strongly believe we don't have to do it.
                         * nd6_purge() is only called from in6_ifdetach(),