From owner-svn-src-all@FreeBSD.ORG  Mon Jan  4 23:39:53 2010
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 7EC871065694;
	Mon,  4 Jan 2010 23:39:53 +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 6E74B8FC1F;
	Mon,  4 Jan 2010 23:39:53 +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 o04NdraC015687;
	Mon, 4 Jan 2010 23:39:53 GMT (envelope-from qingli@svn.freebsd.org)
Received: (from qingli@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o04NdrYp015685;
	Mon, 4 Jan 2010 23:39:53 GMT (envelope-from qingli@svn.freebsd.org)
Message-Id: <201001042339.o04NdrYp015685@svn.freebsd.org>
From: Qing Li <qingli@FreeBSD.org>
Date: Mon, 4 Jan 2010 23:39:53 +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: r201543 - 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: Mon, 04 Jan 2010 23:39:53 -0000

Author: qingli
Date: Mon Jan  4 23:39:53 2010
New Revision: 201543
URL: http://svn.freebsd.org/changeset/base/201543

Log:
  The IFA_RTSELF address flag marks a loopback route has been installed
  for the interface address. This marker is necessary to properly support
  PPP types of links where multiple links can have the same local end
  IP address. The IFA_RTSELF flag bit maps to the RTF_HOST value, which
  was combined into the route flag bits during prefix installation in
  IPv6. This inclusion causing the prefix route to be unusable. This
  patch fixes this bug by excluding the IFA_RTSELF flag during route
  installation.
  
  MFC after:	5 days

Modified:
  head/sys/netinet6/nd6_rtr.c

Modified: head/sys/netinet6/nd6_rtr.c
==============================================================================
--- head/sys/netinet6/nd6_rtr.c	Mon Jan  4 22:57:33 2010	(r201542)
+++ head/sys/netinet6/nd6_rtr.c	Mon Jan  4 23:39:53 2010	(r201543)
@@ -1629,7 +1629,7 @@ nd6_prefix_onlink(struct nd_prefix *pr)
 	bzero(&mask6, sizeof(mask6));
 	mask6.sin6_len = sizeof(mask6);
 	mask6.sin6_addr = pr->ndpr_mask;
-	rtflags = ifa->ifa_flags | RTF_UP;
+	rtflags = (ifa->ifa_flags & ~IFA_RTSELF) | RTF_UP;
 	error = rtrequest(RTM_ADD, (struct sockaddr *)&pr->ndpr_prefix,
 	    ifa->ifa_addr, (struct sockaddr *)&mask6, rtflags, &rt);
 	if (error == 0) {