From owner-p4-projects@FreeBSD.ORG  Tue Oct  9 12:51:29 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 48AD216A41B; Tue,  9 Oct 2007 12:51:29 +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 CD08816A418
	for <perforce@FreeBSD.org>; Tue,  9 Oct 2007 12:51:28 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B069B13C48A
	for <perforce@FreeBSD.org>; Tue,  9 Oct 2007 12:51:28 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l99CpSI1091116
	for <perforce@FreeBSD.org>; Tue, 9 Oct 2007 12:51:28 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l99CpSu4091113
	for perforce@freebsd.org; Tue, 9 Oct 2007 12:51:28 GMT
	(envelope-from zec@FreeBSD.org)
Date: Tue, 9 Oct 2007 12:51:28 GMT
Message-Id: <200710091251.l99CpSu4091113@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127337 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: Tue, 09 Oct 2007 12:51:29 -0000

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

Change 127337 by zec@zec_tpx32 on 2007/10/09 12:50:27

	When reassign an ifnet to another vnet, clean up a reference
	to it in the old vnet's ifindex_table[].

Affected files ...

.. //depot/projects/vimage/src/sys/kern/kern_vimage.c#39 edit

Differences ...

==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#39 (text+ko) ====

@@ -351,6 +351,15 @@
 		/* if_detach(ifp); */
 	}
 	ifp->if_bpf = NULL;
+	/* do/while construct needed to confine scope of INIT_VNET_NET() */
+	do {
+		INIT_VNET_NET(curvnet);
+
+		ifnet_byindex(ifp->if_index) = NULL;
+		/* XXX: should be locked with if_findindex() */
+		while (V_if_index > 0 && ifnet_byindex(V_if_index) == NULL)
+			V_if_index--;
+	} while (0);
 
 	CURVNET_SET_QUIET(new_vnet);
 	INIT_VNET_NET(new_vnet);