From owner-freebsd-stable@FreeBSD.ORG  Mon Oct  2 19:44:29 2006
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
X-Original-To: freebsd-stable@freebsd.org
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EA6DE16A416
	for <freebsd-stable@freebsd.org>; Mon,  2 Oct 2006 19:44:29 +0000 (UTC)
	(envelope-from jhay@meraka.csir.co.za)
Received: from zibbi.meraka.csir.co.za (zibbi.meraka.csir.co.za [146.64.24.58])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5D0B443D78
	for <freebsd-stable@freebsd.org>; Mon,  2 Oct 2006 19:44:25 +0000 (GMT)
	(envelope-from jhay@meraka.csir.co.za)
Received: by zibbi.meraka.csir.co.za (Postfix, from userid 3973)
	id ECC3A33CA4; Mon,  2 Oct 2006 21:44:22 +0200 (SAST)
Date: Mon, 2 Oct 2006 21:44:22 +0200
From: John Hay <jhay@meraka.org.za>
To: Matthew Seaman <m.seaman@infracaninophile.co.uk>
Message-ID: <20061002194422.GA34602@zibbi.meraka.csir.co.za>
References: <451EC677.6000404@infracaninophile.co.uk>
	<20060930203522.GA69912@zibbi.meraka.csir.co.za>
	<20061001093100.O91466@godot.imp.ch>
	<451FAE49.304@infracaninophile.co.uk>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <451FAE49.304@infracaninophile.co.uk>
User-Agent: Mutt/1.4.2.1i
Cc: freebsd-stable@freebsd.org
Subject: Re: Disappearing IPv6 default route
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, 
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Oct 2006 19:44:30 -0000

> > 
> >> -        } else if (req == RTM_ADD && SDL(gate)->sdl_alen == 0) {
> >> +        } else if (req == RTM_ADD && SDL(gate)->sdl_alen == 0 &&
> >> +            (rt->rt_flags & RTF_HOST) != 0) {
> >>             ln->ln_state = ND6_LLINFO_INCOMPLETE;
> 
> Please do MFC.  This patch seems to have solved all the problems I was
> experiencing, and I can see the dancing Kame again now.
> 
> 	Cheers,
> 
> 	Matthew

Can you please try this patch too? The previous one I gave you, still
have some unwanted side effect. This one is by JINMEI, Tatuya and
seems to be without any... As far as I could test.

Thanks.

John
-- 
John Hay -- John.Hay@meraka.csir.co.za / jhay@FreeBSD.org



Index: nd6.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/nd6.c,v
retrieving revision 1.48.2.14
diff -u -r1.48.2.14 nd6.c
--- nd6.c	20 Sep 2006 19:10:18 -0000	1.48.2.14
+++ nd6.c	2 Oct 2006 08:17:30 -0000
@@ -1315,7 +1315,7 @@
 		callout_init(&ln->ln_timer_ch, 0);
 
 		/* this is required for "ndp" command. - shin */
-		if (req == RTM_ADD) {
+		if (req == RTM_ADD && (rt->rt_flags & RTF_STATIC)) {
 		        /*
 			 * gate should have some valid AF_LINK entry,
 			 * and ln->ln_expire should have some lifetime
@@ -1392,8 +1392,6 @@
 					    ip6_sprintf(&llsol), error));
 				}
 			}
-		} else if (req == RTM_ADD && SDL(gate)->sdl_alen == 0) {
-			ln->ln_state = ND6_LLINFO_INCOMPLETE;
 		}
 		break;