From owner-p4-projects@FreeBSD.ORG  Wed May 13 23:32:11 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 12D4210656C1; Wed, 13 May 2009 23:32:11 +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 C726F106564A
	for <perforce@freebsd.org>; Wed, 13 May 2009 23:32:10 +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 B6EDA8FC0C
	for <perforce@freebsd.org>; Wed, 13 May 2009 23:32:10 +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 n4DNWAVf090281
	for <perforce@freebsd.org>; Wed, 13 May 2009 23:32:10 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4DNWAdn090279
	for perforce@freebsd.org; Wed, 13 May 2009 23:32:10 GMT
	(envelope-from zec@fer.hr)
Date: Wed, 13 May 2009 23:32:10 GMT
Message-Id: <200905132332.n4DNWAdn090279@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 162045 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: Wed, 13 May 2009 23:32:12 -0000

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

Change 162045 by zec@zec_tpx32 on 2009/05/13 23:31:15

	if_free_internal() is called with ifp->if_vnet already set to
	NULL, so instead of fetching the vnet context from ifp->if_vnet,
	resort to curvnet instead.
	
	This unbreaks ifconfig destroy operations on cloning ifnets
	with options VIMAGE builds.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/net/if.c#59 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/net/if.c#59 (text+ko) ====

@@ -545,7 +545,7 @@
 static void
 if_free_internal(struct ifnet *ifp)
 {
-	INIT_VNET_NET(ifp->if_vnet);
+	INIT_VNET_NET(curvnet);		/* ifp->if_vnet is already NULL here */
 
 	KASSERT((ifp->if_flags & IFF_DYING),
 	    ("if_free_internal: interface not dying"));