From owner-svn-src-all@FreeBSD.ORG  Sun Aug 30 02:07:23 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9E974106566B;
	Sun, 30 Aug 2009 02:07:23 +0000 (UTC)
	(envelope-from qingli@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8D6278FC17;
	Sun, 30 Aug 2009 02:07:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7U27Nwc080436;
	Sun, 30 Aug 2009 02:07:23 GMT (envelope-from qingli@svn.freebsd.org)
Received: (from qingli@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7U27Nxc080434;
	Sun, 30 Aug 2009 02:07:23 GMT (envelope-from qingli@svn.freebsd.org)
Message-Id: <200908300207.n7U27Nxc080434@svn.freebsd.org>
From: Qing Li <qingli@FreeBSD.org>
Date: Sun, 30 Aug 2009 02:07:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196649 - head/sys/netinet6
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Aug 2009 02:07:23 -0000

Author: qingli
Date: Sun Aug 30 02:07:23 2009
New Revision: 196649
URL: http://svn.freebsd.org/changeset/base/196649

Log:
  Prefix on-link verification is being performed on statically
  configured prefixes. Since these statically configured prefixes
  do not have any associated advertising routers, these prefixes
  are treated as unreachable and those prefix routes are deleted
  from the routing table. Therefore bypass prefixes that are not
  learned from router advertisements during prefix on-link check.
  
  Reviewed by:	hrs

Modified:
  head/sys/netinet6/nd6_rtr.c

Modified: head/sys/netinet6/nd6_rtr.c
==============================================================================
--- head/sys/netinet6/nd6_rtr.c	Sat Aug 29 21:53:08 2009	(r196648)
+++ head/sys/netinet6/nd6_rtr.c	Sun Aug 30 02:07:23 2009	(r196649)
@@ -1415,6 +1415,9 @@ pfxlist_onlink_check()
 			if (pr->ndpr_raf_onlink == 0)
 				continue;
 
+			if (pr->ndpr_raf_auto == 0)
+				continue;
+
 			if ((pr->ndpr_stateflags & NDPRF_DETACHED) == 0 &&
 			    find_pfxlist_reachable_router(pr) == NULL)
 				pr->ndpr_stateflags |= NDPRF_DETACHED;
@@ -1431,6 +1434,9 @@ pfxlist_onlink_check()
 			if (pr->ndpr_raf_onlink == 0)
 				continue;
 
+			if (pr->ndpr_raf_auto == 0)
+				continue;
+
 			if ((pr->ndpr_stateflags & NDPRF_DETACHED) != 0)
 				pr->ndpr_stateflags &= ~NDPRF_DETACHED;
 		}
@@ -1454,6 +1460,9 @@ pfxlist_onlink_check()
 		if (pr->ndpr_raf_onlink == 0)
 			continue;
 
+		if (pr->ndpr_raf_auto == 0)
+			continue;
+
 		if ((pr->ndpr_stateflags & NDPRF_DETACHED) != 0 &&
 		    (pr->ndpr_stateflags & NDPRF_ONLINK) != 0) {
 			if ((e = nd6_prefix_offlink(pr)) != 0) {