From owner-p4-projects@FreeBSD.ORG  Mon Dec 15 09:09:42 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A85611065675; Mon, 15 Dec 2008 09:09:42 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6BF081065672
	for <perforce@freebsd.org>; Mon, 15 Dec 2008 09:09:42 +0000 (UTC)
	(envelope-from zec@icir.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5D7B98FC19
	for <perforce@freebsd.org>; Mon, 15 Dec 2008 09:09:42 +0000 (UTC)
	(envelope-from zec@icir.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBF99gVc027115
	for <perforce@freebsd.org>; Mon, 15 Dec 2008 09:09:42 GMT
	(envelope-from zec@icir.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBF99g3X027113
	for perforce@freebsd.org; Mon, 15 Dec 2008 09:09:42 GMT
	(envelope-from zec@icir.org)
Date: Mon, 15 Dec 2008 09:09:42 GMT
Message-Id: <200812150909.mBF99g3X027113@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@icir.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 154696 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Dec 2008 09:09:42 -0000

http://perforce.freebsd.org/chv.cgi?CH=154696

Change 154696 by zec@zec_tca51 on 2008/12/15 09:09:01

	Unbreak VIMAGE build.

Affected files ...

.. //depot/projects/vimage/src/sys/netinet6/nd6.c#42 edit
.. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#28 edit

Differences ...

==== //depot/projects/vimage/src/sys/netinet6/nd6.c#42 (text+ko) ====

@@ -873,7 +873,6 @@
 struct llentry *
 nd6_lookup(struct in6_addr *addr6, int flags, struct ifnet *ifp)
 {
-	INIT_VNET_INET6(curvnet);
 	struct sockaddr_in6 sin6;
 	struct llentry *ln;
 	int llflags = 0;

==== //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#28 (text+ko) ====

@@ -1536,6 +1536,7 @@
 int
 nd6_prefix_onlink(struct nd_prefix *pr)
 {
+	INIT_VNET_NET(curvnet);
 	INIT_VNET_INET6(curvnet);
 	struct ifaddr *ifa;
 	struct ifnet *ifp = pr->ndpr_ifp;