From owner-p4-projects@FreeBSD.ORG  Sat May  2 10:36:27 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ED8E91065676; Sat,  2 May 2009 10:36:26 +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 ADE571065674
	for <perforce@freebsd.org>; Sat,  2 May 2009 10:36:26 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9CB528FC0C
	for <perforce@freebsd.org>; Sat,  2 May 2009 10:36:26 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n42AaQFp030577
	for <perforce@freebsd.org>; Sat, 2 May 2009 10:36:26 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n42AaQUU030575
	for perforce@freebsd.org; Sat, 2 May 2009 10:36:26 GMT
	(envelope-from zec@fer.hr)
Date: Sat, 2 May 2009 10:36:26 GMT
Message-Id: <200905021036.n42AaQUU030575@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 161473 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: Sat, 02 May 2009 10:36:28 -0000

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

Change 161473 by zec@zec_tpx32 on 2009/05/02 10:35:41

	1st pass / attempt at unbreaking new mcast6 code in
	options VIMAGE builds.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#19 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#19 (text+ko) ====

@@ -2908,7 +2908,6 @@
 	 * indexes to guard against interface detach, they are
 	 * unique to each VIMAGE and must be retrieved.
 	 */
-	CURVNET_SET(m->m_pkthdr.rcvif->if_vnet); /* XXX Marko revisit! */
 	INIT_VNET_NET(curvnet);
 	INIT_VNET_INET6(curvnet);
 	ifindex = mld_restore_context(m);
@@ -2987,10 +2986,7 @@
 		}
 	}
 out:
-	/*
-	 * We must restore the existing vnet pointer before continuing.
-	 */
-	CURVNET_RESTORE();
+	return;
 }
 
 /*